Commit graph

18778 commits

Author SHA1 Message Date
Jooyung Han
c6e538406c Merge "Add "jni_libs" property to apex module" 2020-02-28 17:12:53 +00:00
Jooyung Han
6e147e4f54 Merge changes I789b526c,Ie15c811f
* changes:
  apex: refactor apex properties
  apex: fix a test util (ensureExactContent)
2020-02-28 17:08:45 +00:00
Automerger Merge Worker
bf3da2c758 Merge changes I32bc93e0,I7ec47dbc am: dd72d689e7
Change-Id: Icaaa8deaa2ff925e9fa196d7302821cff0d62e5d
2020-02-28 11:28:09 +00:00
Paul Duffin
dd72d689e7 Merge changes I32bc93e0,I7ec47dbc
* changes:
  Avoid invoking sdk member to add empty list of dependencies
  Add windows to the list of available OS's in sdk tests
2020-02-28 11:22:18 +00:00
Automerger Merge Worker
902afd2dbe Merge "Distinguish boot images by target rather than arch" am: e7ea9e631d
Change-Id: I168a8e3227df2830e51aa4ba0eb5dbbe011704c4
2020-02-28 11:21:13 +00:00
Paul Duffin
cc1b3da17a Avoid invoking sdk member to add empty list of dependencies
Simplifies debugging sdk membership code when it is only called if an
appropriate member is present.

Test: m nothing
Change-Id: I32bc93e0484c829bdbd6b050822249feb6404f89
2020-02-28 11:21:06 +00:00
Paul Duffin
08798aae0b Add windows to the list of available OS's in sdk tests
Makes the tests more realistic as they cover what happens when an sdk
OS specific variant is disabled (Windows is disabled by default). This
will allow issues around disabled variants to be detected early during
Soong bootstrapping.

Test: m nothing
Change-Id: I7ec47dbca52e38750166d755daf706aadea12d15
2020-02-28 11:21:06 +00:00
David Srbecky
e7ea9e631d Merge "Distinguish boot images by target rather than arch" 2020-02-28 11:07:45 +00:00
Automerger Merge Worker
82e9e2833a Merge "No symlink for host APEXes" am: 0ffa3aba78
Change-Id: Idd179e8a305f6797cf83fdc277ab1d83f1b32f24
2020-02-28 00:14:23 +00:00
Jiyong Park
0ffa3aba78 Merge "No symlink for host APEXes" 2020-02-27 23:56:24 +00:00
Automerger Merge Worker
dde07924cb Merge "Only dist apex sizes for checkbuild" am: 2d4b8d2188
Change-Id: I7aa8503bd0937ad4f6e201df898ca7ca4537fd7e
2020-02-27 21:34:47 +00:00
Colin Cross
2d4b8d2188 Merge "Only dist apex sizes for checkbuild" 2020-02-27 21:08:11 +00:00
Automerger Merge Worker
6d6dc316a5 Merge changes I9170c7e2,I058201b2,Icf37bb3d am: 2642bc6d82
Change-Id: I40b76cec7de135ee28e9382ba4f43e8e70a5b287
2020-02-27 15:40:59 +00:00
Treehugger Robot
2642bc6d82 Merge changes I9170c7e2,I058201b2,Icf37bb3d
* changes:
  Make filesToInstall return InstallPaths and add it to Module
  Add pathForInstall and InstallPaths
  Add InstallForceOS, fix testcases for host
2020-02-27 15:28:49 +00:00
Automerger Merge Worker
a3cc927fdb Merge "Support arch variant for data attribute" am: 6f9bfc01a2
Change-Id: I0568135c66bdefb7c060a9fc0c0280e68a034877
2020-02-27 06:25:28 +00:00
Dan Shi
6f9bfc01a2 Merge "Support arch variant for data attribute" 2020-02-27 06:06:50 +00:00
Jooyung Han
643adc4896 Add "jni_libs" property to apex module
Which is the list of JNI libraries that are embeded inside the apex.
jni_libs is handled just like native_shared_libs except that it is
stored in apex_manifest.

When linkerconfig finds an apex with JNI libs, it exposes the namespace
for the apex as visible so that libnativeloader can link the namespace
to the corresponding classloader-namespace.

Bug: 149363889
Test: m nothing(runs soong test)
Change-Id: I52ebe38b44545e6e8853e34a3404a235c858112a
2020-02-27 13:50:06 +09:00
Jooyung Han
01a868d096 apex: refactor apex properties
Embed common properties (apexNativeDependencies) so that the logic for
adding dependencies for native modules can be reused.

Bug: N/A
Test: m

Change-Id: I789b526c09eea14213ab1544590ed2238ed8c625
2020-02-27 13:45:14 +09:00
Jooyung Han
e6436d7bf0 apex: fix a test util (ensureExactContent)
ensureExactContent shouldn't return immediately when it finds a match
from expected list of files.

Bug: N/A
Test: m nothing
Change-Id: Ie15c811f9cfcae7ede28dee0fcf203cee24659a0
2020-02-27 13:31:56 +09:00
Jiyong Park
638d30ed21 No symlink for host APEXes
Symlinking doesn't make sense for host APEXes.

Bug: 150255435
Test: m com.android.art.host and inspect the built APEX; there is
no symlink.

Merged-In: I28492dfaaef471117a430be05255fbef76e557b0
(cherry picked from commit 9b96418dfe)
Change-Id: I28492dfaaef471117a430be05255fbef76e557b0
2020-02-27 12:09:33 +09:00
Colin Cross
1c85e8e019 Only dist apex sizes for checkbuild
Using $(call dist-for-goals,droidcore,...) for every apex
installed-files.txt causes every apex to be built for all builds,
causing a signficiant regression in build time.  For now only
dist them in checkbuilds, which were going to build all of them
anyways.

Ideally we would like to dist the installed-files.txt only if
the apex was already built, but there is not currently a way to
express that.

Test: treehugger
Bug: 149979076
Change-Id: I21edbc90980f94ad6d497cb86ee80223dd782fe1
2020-02-27 00:58:50 +00:00
Automerger Merge Worker
a5dfbff82f Merge "In kzip files, compilation unit paths should be relative to top." am: 21321efc66
Change-Id: I762f3f7905ce7f8bcb5742942d40429ff4c6747f
2020-02-26 21:39:14 +00:00
Alexander Smundak
21321efc66 Merge "In kzip files, compilation unit paths should be relative to top." 2020-02-26 21:31:37 +00:00
Automerger Merge Worker
c07a0cf902 Merge "Unless overridden include LICENSE files in notices." am: 40017be1c3
Change-Id: Idd0793baf0e6c18ed3bc1bd295a70228d6c553cd
2020-02-26 20:49:00 +00:00
Bob Badour
40017be1c3 Merge "Unless overridden include LICENSE files in notices." 2020-02-26 20:37:22 +00:00
David Srbecky
c177ebeca9 Distinguish boot images by target rather than arch
We plan to add boot image variants for host tests.
Distinguishing the variants by arch does not work,
since both host and device can have the same arch.

Change-Id: Iea73c77367affb074f97a0fc318389417ce537da
2020-02-26 17:04:21 +00:00
Automerger Merge Worker
35189efd1d Convert cc to AndroidMkEntries am: d80cbca76d
Change-Id: I509d14736842b97489dc63c01ad0b0412124154c
2020-02-26 16:51:59 +00:00
Colin Cross
d80cbca76d Convert cc to AndroidMkEntries
Use AndroidMkEntries so the next patch can use ExtraFooters, which
doesn't exist in AndroidMkData.

Test: manually diff out/soong/Android.aosp_x86_64.mk
Change-Id: Ia3006b6747813693cf7e2b536030b21f3109f538
2020-02-25 19:53:04 -08:00
Automerger Merge Worker
52b4afe8f2 Merge "apex: do not follow jni_libs from android_app" am: 077f9a44f9
Change-Id: Ibe282ebd930a6a53026eda08a6abb1bc28894fb5
2020-02-26 02:55:48 +00:00
Jooyung Han
077f9a44f9 Merge "apex: do not follow jni_libs from android_app" 2020-02-26 02:35:10 +00:00
Dan Shi
67a8834735 Support arch variant for data attribute
Bug: 143220441
Test: atest VtsHalDrmV1_2TargetTest
Change-Id: I2381f78b486852da267caa363b4c4cb5660c9055
2020-02-25 16:34:39 -08:00
Automerger Merge Worker
0c34e7e308 Merge "Update ike.jar's name in code coverage configuration" am: 9a63ee1b4f
Change-Id: I0484fed50a5b727c854e194fab2160315d07aca0
2020-02-25 22:04:10 +00:00
Yan Yan
9a63ee1b4f Merge "Update ike.jar's name in code coverage configuration" 2020-02-25 21:56:43 +00:00
Colin Cross
b72c909899 Collect metrics from inside soong_build
Collect the number of modules and variants and some basic statistics
on memory usage inside soong_build by writing out a proto that is
read back in by soong_ui.

Test: examine soong.log
Change-Id: I6926876377a4f6229cf41fdbf166ae03c885ea55
2020-02-25 20:50:00 +00:00
Automerger Merge Worker
f299645528 Merge "Fix forwarding a vararg parameter" am: f3be200bcf
Change-Id: I86b418711449eed67a543d190e0106f5f6784291
2020-02-25 20:16:57 +00:00
Treehugger Robot
f3be200bcf Merge "Fix forwarding a vararg parameter" 2020-02-25 20:06:53 +00:00
Sasha Smundak
b8f46cd2d6 In kzip files, compilation unit paths should be relative to top.
Fixes inter-module cross references.

Bug: 137798757
Test: build kzips, verify paths
Change-Id: I5cf64972ae61b869c96aafea5de0a48303d9af83
2020-02-25 11:22:17 -08:00
Jooyung Han
cd87c69de4 Fix forwarding a vararg parameter
vararg parameter is passed without unpacking, which prints
not-so-useful value.

Bug: N/A
Test: m
Change-Id: I03f011557d10c6e2bc06813491cd8df2cce7c6ea
2020-02-26 02:05:18 +09:00
Automerger Merge Worker
cca4f68ddf Merge "Add min_sdk_version property to apexes" am: 414d50c35d
Change-Id: I263f29ad9715077bb0de04aca318109ffd4b5ffd
2020-02-25 15:49:07 +00:00
Colin Cross
414d50c35d Merge "Add min_sdk_version property to apexes" 2020-02-25 15:34:26 +00:00
Jooyung Han
b7bebe2616 apex: do not follow jni_libs from android_app
Because APK-in-APEX embeds its jni_libs in it. We don't have to follow
deps of jni_libs.

Bug: 146992436
Test: m com.android.tethering
      deapexer extract com.android.tethering.apex apex
      ls apex # there should be no /lib dir

Change-Id: Ifa1a6430a420ae7376b155cd59b8ece462cced7e
2020-02-25 20:47:04 +09:00
Automerger Merge Worker
92e2a41ea0 Merge "Add support for cc_library_headers in sdk/module_exports" am: e1fd6a9bd8
Change-Id: I7bb61648a44cf3db37309a84da1f67c19a2beee4
2020-02-25 10:41:15 +00:00
Automerger Merge Worker
2482182b3b Merge "Prune any empty property sets from the modules before transforming" am: 78036c8afa
Change-Id: Ia8e8cd67d95c13811f8abb4971884dc7ac609dba
2020-02-25 10:41:10 +00:00
Automerger Merge Worker
0f0bb62979 Merge "Simplify cc library sdk snapshot handling of include dirs/headers" am: 2125138f25
Change-Id: I2ebff725f3053392d5393bff07b849de7fb76617
2020-02-25 10:41:04 +00:00
Automerger Merge Worker
f8809f7dc6 Merge "Add support for transforming a property set after its contents" am: cbe936cc43
Change-Id: I6d1d7dac0224e5d77ea1acb3a40b8870ea29bcca
2020-02-25 10:40:59 +00:00
Automerger Merge Worker
2dd1518f4a Merge "Fix issues with bp transformation" am: e574be5c07
Change-Id: Ib53635316c2a96b39668ac25b844a263f71506fe
2020-02-25 10:40:48 +00:00
Paul Duffin
e1fd6a9bd8 Merge "Add support for cc_library_headers in sdk/module_exports" 2020-02-25 10:29:39 +00:00
Paul Duffin
78036c8afa Merge "Prune any empty property sets from the modules before transforming" 2020-02-25 10:28:52 +00:00
Paul Duffin
2125138f25 Merge "Simplify cc library sdk snapshot handling of include dirs/headers" 2020-02-25 10:28:35 +00:00
Paul Duffin
cbe936cc43 Merge "Add support for transforming a property set after its contents" 2020-02-25 10:21:34 +00:00