commit 7906764e662c1fc7d260d608eb20883ab863246d
author Martin Stjernholm <mast@google.com> Thu May 13 16:24:12 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 13 16:24:12 2021 +0000
tree dbdd448d1059e0ae74dfb6ab392ccc4564fe453d
parent 29bc034b8ca504a8e4bb2d6afbf9e448eca2b038
parent 9f9741330c879585eb19a57591fea6cb164bb516

Export dexdump, oatdump, and veridex as prebuilt host tools. am: 2b527c4f86 am: 9f9741330c

Original change: https://android-review.googlesource.com/c/platform/art/+/1703925

Change-Id: Ie78982e3fe5d09cd204365da5f1b78d3499a0e84

build/sdk/Android.bp

diff --git a/build/sdk/Android.bp b/build/sdk/Android.bp
index 79abbc1..f6b37e7 100644
--- a/build/sdk/Android.bp
+++ b/build/sdk/Android.bp
@@ -180,10 +180,13 @@
                 "okhttp-norepackage",
             ],
             native_binaries: [
-                "hiddenapi",
                 "dex2oat",
                 "dex2oatd",
+                "dexdump",
+                "hiddenapi",
+                "oatdump",
                 "profman",
+                "veridex",
             ],
             native_libs: [
                 "libartpalette", // libdexfile dependency

dexdump/Android.bp

diff --git a/dexdump/Android.bp b/dexdump/Android.bp
index 3b651e8..87abfc1 100644
--- a/dexdump/Android.bp
+++ b/dexdump/Android.bp
@@ -47,6 +47,7 @@
         // static_sdk_tools build.
         host: {
             enabled: true,
+            stl: "libc++_static",
             static_libs: [
                 "libdexfile",
                 "libartbase",