diff --git a/envsetup.sh b/envsetup.sh
index aa90b4d..e4afdb9 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1371,7 +1371,7 @@
     mkdir -p $ANDROID_PRODUCT_OUT || return 1
 
     # Note, can't use absolute path because of the way make works.
-    m out/target/product/$(get_build_var TARGET_DEVICE)/module-info.json \
+    m $(get_build_var PRODUCT_OUT)/module-info.json \
         > $ANDROID_PRODUCT_OUT/module-info.json.build.log 2>&1
 }