commit 865b6605caf02910c333de43cb908f63a07bbf13
author Baligh Uddin <baligh@google.com> Wed Oct 28 05:16:46 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 28 05:16:46 2020 +0000
tree 65a531171a72ff88d94801e35dcc26f62ecc6907
parent b979b79bd95937a55b806fb1b6210babce2ca0d7
parent 4dc00c60daa0ead735be6d66a0604c7add6b568c

Merge "Move {libbacktrace,libunwindstack} from system/core -> system/unwinding/"

envsetup.sh

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
 }
 

tools/signapk/Android.bp

diff --git a/tools/signapk/Android.bp b/tools/signapk/Android.bp
index c799dbf..f5b2ba7 100644
--- a/tools/signapk/Android.bp
+++ b/tools/signapk/Android.bp
@@ -16,7 +16,7 @@
 
 // the signapk tool (a .jar application used to sign packages)
 // ============================================================
-java_library_host {
+java_binary_host {
     name: "signapk",
     srcs: ["src/**/*.java"],
     manifest: "SignApk.mf",
@@ -32,6 +32,7 @@
     // The post-build signing tools need signapk.jar (and its shared libraries,
     // handled in their own Android.bp files)
     dist: {
+        tag: ".jar",
         targets: ["droidcore"],
     },
 }