commit 2b84cf8a1dbc77df88fafec55ce5f45ff8778268
author Martin Stjernholm <mast@google.com> Thu Jan 28 22:54:14 2021 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 29 11:43:41 2021 +0000
tree 6a988d1cac8488d79c44a360d940491c56e637ec
parent 7d1a7f1c5b08bd1a2e1a4d72b9d874229081982f

Don't use whole_static_libs in libnativeloader.

It has the effect that all the headers of those libs get included in
the libnativeloader prebuilt snapshots, which in this particular case
makes it contain all the xxx.sysprop.h generated headers from
PlatformPropoerties.

Test: mmm art/libnatveloader
Test: `m art-module-sdk` and check that art-module-sdk-current.zip
  doesn't have any .sysprop.h files
Bug: 178379642
Change-Id: Ic11007945fd6f1cd2d7996cae8a7b533c91aea7b

libnativeloader/Android.bp

diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index dbcde12..993e5d5 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -57,7 +57,7 @@
             shared_libs: [
                 "libdl_android",
             ],
-            whole_static_libs: [
+            static_libs: [
                 "PlatformProperties",
             ],
         },