Commit Graph

1693 Commits

Author SHA1 Message Date
Treehugger Robot
bf857716a1 Merge "Dedup code for generating prebuilt_stubs_sources in snapshot" 2019-11-27 16:21:41 +00:00
Ulyana Trafimovich
f94be47d8a Merge "Revert^2 "Do not dexpreopt system server jars from updatable modules."" am: 565b52610f am: ee40866813
am: 2a4240aead

Change-Id: I67eb9b18db6f736ae280741b896b7cd2c9944194
2019-11-27 06:14:45 -08:00
Ulyana Trafimovich
565b52610f Merge "Revert^2 "Do not dexpreopt system server jars from updatable modules."" 2019-11-27 12:45:34 +00:00
Ulyana Trafimovich
f2cb7e959b Revert^2 "Do not dexpreopt system server jars from updatable modules."
This reverts commit 01f6b0a656.

Reason for revert: Build failure is not reproducible.
Forrest build on the same build ID 6033773 and same target
cf_x86_phone-userdebug_coverage finished successfully.

Change-Id: I5077f8332aa0b8037e324b89d41f35b86b8cf216
2019-11-27 12:29:50 +00:00
Søren Gjesse
8e505e3f01 Remove passing -forceprocessing flag to R8
R8 ignores the flag

Test: m -j
Change-Id: Ie394dfc24bb5632717d23e9ab4ad03b6cc1feb19
2019-11-27 12:40:07 +01:00
Kyeongkab.Nam
da55b2f3ba Merge "Fix incorrect install path for priv-app prebuilt" am: a75606be1e am: d9bfc18600
am: ae52626186

Change-Id: Id51b81af6454911eaf84b2d2947b3eeada8b7a0d
2019-11-27 02:21:03 -08:00
Treehugger Robot
a75606be1e Merge "Fix incorrect install path for priv-app prebuilt" 2019-11-27 09:20:15 +00:00
Artur Satayev
dd3f6477df Merge "Add exported_plugins to java.Library." am: 4a692427f7 am: bedffa880d
am: 1c2809d197

Change-Id: I64626eaf10e01fc5e1938b0b96c7df8ce12e70ae
2019-11-26 17:05:46 -08:00
Treehugger Robot
4a692427f7 Merge "Add exported_plugins to java.Library." 2019-11-27 00:52:46 +00:00
Paul Duffin
b1a8813520 Dedup code for generating prebuilt_stubs_sources in snapshot
Removes duplicated code for generating a versioned and non-versioned
form of the prebuilt_stubs_sources module in the snapshot.

Bug: 143678475
Test: m nothing

Change-Id: Ic431b6fcb6f3c7c85f1a04cb6f087424aaf0cffa
2019-11-26 22:30:27 +00:00
Artur Satayev
9cf4669bc4 Add exported_plugins to java.Library.
The behaviour is similar to go/be#java_library.exported_plugins. Plugins added to exported_plugins of library X are not applied to the library itself, but rather to libraries that directly depend on the library X.

Test: m checkbuild
Bug: 139740873
Change-Id: I4042bd482ad9cb12d6fbaac51f039d38b1b7a428
2019-11-26 19:05:26 +00:00
Paul Duffin
8de63efacb Dedup code for generating java_import in snapshot am: 50e7900744 am: 82b6fe6f2c
am: bf88789520

Change-Id: Iddbe068271e82603584cbca4ed19bb95f6bd9d90
2019-11-26 09:47:45 -08:00
Paul Duffin
50e7900744 Dedup code for generating java_import in snapshot
Removes duplicated code for generating a versioned and non-versioned
form of the java_import module in the snapshot.

Bug: 143678475
Test: m nothing and check output for dummy sdk
Change-Id: Ia8d05c3bf9ef79953a817b168dd9d59f2af2d2ce
2019-11-26 16:19:36 +00:00
Ulyana Trafimovich
fef2ec8e07 Merge "Revert "Do not dexpreopt system server jars from updatable modules."" am: 9d8dab57a5 am: a5bad9e22e
am: 1cddc7dabc

Change-Id: I3f04c3d57d4b1cab16c433979ea3aa6a04b49f21
2019-11-26 05:24:38 -08:00
Ulyana Trafimovich
9d8dab57a5 Merge "Revert "Do not dexpreopt system server jars from updatable modules."" 2019-11-26 13:07:48 +00:00
Ulyana Trafimovich
01f6b0a656 Revert "Do not dexpreopt system server jars from updatable modules."
This reverts commit 61c325ebcc.

Reason for revert: broken build git_master/cf_x86_phone-userdebug_coverage (likely caused by these changes).

Exempt-From-Owner-Approval: revert.

Change-Id: I88ddd3af3a6c4ffdaa1fbb881d965356c5c75ad3
2019-11-26 13:06:38 +00:00
Ulyana Trafimovich
4080f0420c Merge "Do not dexpreopt system server jars from updatable modules." am: 40227e55be am: fd88a29801
am: dd59ef32b3

Change-Id: I65a2b942786bddca6cdf339dcb86e38a8c738b19
2019-11-26 02:31:30 -08:00
Ulyana Trafimovich
40227e55be Merge "Do not dexpreopt system server jars from updatable modules." 2019-11-26 10:18:02 +00:00
Colin Cross
1e70757891 Make TestContext.RegisterModuleType take an android.ModuleFactory am: 4b49b768a2 am: 89169a36dd
am: ac3fe4d8ae

Change-Id: I7c0e5d743434231ec8784e1bb9ba7dc12d7c0c07
2019-11-25 14:28:57 -08:00
Colin Cross
4b49b768a2 Make TestContext.RegisterModuleType take an android.ModuleFactory
Avoid having to pass ModuleFactoryAdaptor to every call to
RegisterModuleType in a test by wrapping RegisterModuleType.

Test: all soong tests
Change-Id: If8847d16487de0479cc3020b728256922b3cadba
2019-11-25 10:59:44 -08:00
Paul Duffin
bc327c22bf Merge changes Ie274263a,I45993324 am: 62835fd85f am: 1a88e1d863
am: 2eec16237d

Change-Id: I0425682c73c6db159effee280363cf08c10faac3
2019-11-25 09:53:38 -08:00
Paul Duffin
62835fd85f Merge changes Ie274263a,I45993324
* changes:
  Adds droidstubs support to sdk module
  Simplify building an SDK snapshot from the command line
2019-11-25 17:32:53 +00:00
Ulya Trafimovich
61c325ebcc Do not dexpreopt system server jars from updatable modules.
Test: m

Test: The list of updatable system server jars is empty now,
  so I tested that the filer works with a manual experiment:
  - temporarily add ethernet-service to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
  - m nothing
  - fgrep -e 'ethernet-service' $ANDROID_BUILD_TOP/out/soong/build.ninja | grep dexpreopt
  - expect empty output (no dexpreopt command is generated)

Change-Id: I0b231e823d5a5a97632daa2b5eb7be3e06782004
2019-11-25 16:36:57 +00:00
Roshan Pius
5642bdbe7f Merge "soong: Support system_server jars from apexes" am: ac25dd3cb2 am: 168c17e1e0
am: f3feeac871

Change-Id: Ib2eeea2e9bf956214246a14f951ec938a3dc711c
2019-11-22 19:21:11 -08:00
Paul Duffin
9154718303 Adds droidstubs support to sdk module
Adds stubs_sources property to sdk and unzips the droidstubs srcjar
into the snapshot directory.

Adds an UnzipToSnapshot method to the SnapshotBuilder which creates
a rule that uses zip2zip to repackage the supplied zip content into a
temporary zip file that matches what the required snapshot structure.
e.g. if the supplied zip contains foo/Foo.java and that needs to be in
the snapshot directory java/foo/stubs then it will create a zip that
contains java/foo/stubs/foo/Foo.java.

The temporary zip that is the output of that rule is added to the
zipsToMerge field for merging later.

If the zipsToMerge is empty then the snapshot zip is created as
before. Otherwise, a temporary zip file is created. That is then
merged with the other zip files in zipsToMerge to create the final
snapshot zip.

Adds prebuilt_stubs_sources for use by the generated .bp module.

Bug: 143678475
Test: added conscrypt sdk module and attempted to build it
Change-Id: Ie274263af3a08e36a73c61c0dbf0c341fd6967e2
2019-11-22 20:52:59 +00:00
Roshan Pius
9b51a4078a soong: Support system_server jars from apexes
Allow system_server jars delivered via apex. Regular system_server
jars are located in /system/framework folder. But, jars delivered via
apex are mounted at /apex/<module_name>/javalib.

Bug: 144722612
Bug: 141785760
Test: Compiles
Change-Id: Ia40bb91d2e05b2601a52eac28a985fe2d8da3481
2019-11-22 12:47:11 -08:00
Kyeongkab.Nam
c49971469f Fix incorrect install path for priv-app prebuilt
Dexpreopted files for privleged app prebuilt(android_app_import) are
installed wrongly to /system/app.
To fix this issue, install path is changed to /system/priv-app
in the case that "privileged" flag is true.

Bug: 144945646
Test: build and check dexpreopted files of privileged app are
      installed to /system/priv-app

Change-Id: Iec140119f58179a3eb0feeff7af2699fcc855fe7
2019-11-22 13:36:21 +09:00
Jaewoong Jung
c82a6fa3a8 Merge "Fix test app and helper installation dirs." am: a21e9ddcf8 am: 41afdba365
am: 1af3f997df

Change-Id: I7d59f1604c1cc1cfee435a24c5838de07f011ab5
2019-11-21 15:34:29 -08:00
Treehugger Robot
a21e9ddcf8 Merge "Fix test app and helper installation dirs." 2019-11-21 23:20:16 +00:00
Jaewoong Jung
326a9417ce Fix test app and helper installation dirs.
Fixes: 143902486
Test: app_test.go + m CtsIsolatedSplitApp
Change-Id: I3e1b8bf14cb9f440a6d8b0d2ac65525f00470cb8
2019-11-21 10:41:00 -08:00
Artur Satayev
c5b4f99104 Pass hiddenapi-greylist-max-q.txt to greylist generator.
Bug: 137350495
Test: m, manual inspection of out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: I67227307ec08ab56a385980eceacaab1b985eb49
Merged-In: I67227307ec08ab56a385980eceacaab1b985eb49
2019-11-20 10:46:16 +00:00
Artur Satayev
3846426576 Pass hiddenapi-greylist-max-q.txt to greylist generator.
Bug: 137350495
Test: m, manual inspection of out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: I67227307ec08ab56a385980eceacaab1b985eb49
2019-11-20 10:45:09 +00:00
Jaewoong Jung
cc157ef9e1 Merge "Add override_android_test." am: 29883dece6 am: 37b10e4c6d
am: 9a7a9b249e

Change-Id: I71f62d78fc4cf55f8d5c476d60139dff3161c5be
2019-11-16 19:11:03 -08:00
Jaewoong Jung
26dedd36ed Add override_android_test.
This change also adds instrumentation_target_package to android_test, so
that the target package name in a test manifest can be easily
overridden.

Fixes: 134624457
Test: app_test.go
Change-Id: Ib8dd703da0038ac76210c92d79e133e37c718122
2019-11-15 15:06:06 -08:00
Paul Duffin
d14b5915ba Merge "Refactor sdk update mechanism" am: 0f568b1237 am: 6c6e830af8
am: a7eb04f0ea

Change-Id: I8ef61cbeb77d5660b6b7ca28342d47d563bf6b4d
2019-11-15 07:32:40 -08:00
Treehugger Robot
0f568b1237 Merge "Refactor sdk update mechanism" 2019-11-15 15:19:13 +00:00
Jiyong Park
7990672d88 Merge changes Ibcc1096e,I21ac2441 am: bc196606c3 am: b2876f9b3d
am: e6a4504d88

Change-Id: I9aaf63f91f452e1f1faff17eedd55add0dc4d1cd
2019-11-14 18:13:15 -08:00
Treehugger Robot
bc196606c3 Merge changes Ibcc1096e,I21ac2441
* changes:
  Install AndroidApp only when needed
  Reland: JNI lib is always embedded for APKs in APEX
2019-11-15 00:10:05 +00:00
Paul Duffin
0e0cf1dca5 Refactor sdk update mechanism
Creates a SnapshotBuilder and GeneratedSnapshotFile interfaces to allow
the java library snapshot work to be moved into the java package.

Test: m -j60 checkbuild
Change-Id: I857167616026149d5e85885621b53876b419ba9b
2019-11-14 17:49:02 +00:00
Jooyung Han
5e0bfd200c Merge "make ApexProperties defaultable" am: c5c4d18db0 am: 53b46ff2e9
am: a18014915f

Change-Id: I0c1a56d102eff5d7c83795f0e351be58f633987e
2019-11-13 17:04:30 -08:00
Sam Saccone
16e7ca47f4 Merge "Revert submission" am: f9e10f9443 am: 3249fcda3b
am: c31044e6cd

Change-Id: If63b887cdce6ef7000ffc19f3ceb6b4636763bf6
2019-11-13 08:28:19 -08:00
Jiyong Park
8ba50f953d Install AndroidApp only when needed
When an android_app is (directly or transitively) included in an APEX,
multiple variants of the app is created. The problem was that all the
variants were unconditionally installed to the device, which resulted in
duplicated targets. Fixing the problem by not installing the app when it
is included in APEX.

Bug: 144387414
Bug: 144135069
Test: m
Test: OUT_DIR=out DIST_DIR=out/dist build/soong/scripts/build-ndk-prebuilts.sh
Change-Id: Ibcc1096e30bc55a70ddc592490805f447e185eae
2019-11-14 00:39:53 +09:00
Jiyong Park
52cd06fc73 Reland: JNI lib is always embedded for APKs in APEX
If a JNI lib is depended on by an APK that is included in an APEX, the
lib is embedded inside the APK.

This change also fixes a bug that APKs are not mutated for APEXes.

Bug: 144135069
Test: m (apex_test.go amended)
Change-Id: I21ac24412b30c05afc03385655c6b196130dffe3
2019-11-14 00:39:47 +09:00
Sam Saccone
f9e10f9443 Merge "Revert submission" 2019-11-13 15:24:50 +00:00
Sam Saccone
e3c22f7a3f Revert submission
Reason for revert: b/144387414
Fixes: b/144387414
Change-Id: I21e15a4d149a5a8fefd0f84010600cb41b59db95
2019-11-13 15:24:11 +00:00
Jooyung Han
18020eabc4 make ApexProperties defaultable
ApexPropreties are added in InitApexModule() and they are supposed to be
defaultable. To be defaultable, InitApexModule() should be called before
InitDefaultableModule().

Bug: 144332048
Test: m (soong test added)
Change-Id: I6c90ed3b66a086292a4c0ecb37c61f83769e62bd
2019-11-13 05:52:57 +00:00
Jiyong Park
14223e16a2 Merge "JNI lib is always embedded for APKs in APEX" am: d006779e3e am: bfb534fe53
am: 05e9b9db46

Change-Id: I71a0e2af9fe460c1cbd1e0fb4334b10b938d1d6c
2019-11-12 18:52:43 -08:00
Treehugger Robot
d006779e3e Merge "JNI lib is always embedded for APKs in APEX" 2019-11-13 02:25:25 +00:00
Pete Gillin
1209d7ebbc Merge changes I0d679648,I31542e7f am: 31d57588c9 am: 6414dde54e
am: 176de85374

Change-Id: I06ce4efde1122b79b757cef2985ac4ecabad80a6
2019-11-11 10:28:06 -08:00
Ulyana Trafimovich
10314566b1 Merge "Revert^4 "Package dexpreopt artifacts for libcore jars in the ART apex."" am: b21ed4281e am: 8ca57b35ea
am: 7826a2f02a

Change-Id: I191925cc1d1b2abc98c6dfbeedf77ccf1fd02938
2019-11-11 10:11:59 -08:00