Commit Graph

407 Commits

Author SHA1 Message Date
Automerger Merge Worker
b0caf616e3 Merge "Allow for overriding container packagename for an Apex." am: c822818147 am: 5b88818470 am: 78c5fa002b am: 047b38e894 am: 693f970cce
Change-Id: I18aed48dc220b69cec89d81a47500abb7152058a
2020-03-17 00:34:53 +00:00
Automerger Merge Worker
78c5fa002b Merge "Allow for overriding container packagename for an Apex." am: c822818147 am: 5b88818470
Change-Id: Ic41a6ec13f3d8dbceda05fb3c330ac5cee01aca5
2020-03-16 23:42:50 +00:00
Baligh Uddin
c822818147 Merge "Allow for overriding container packagename for an Apex." 2020-03-16 23:07:31 +00:00
Baligh Uddin
5b57dbad86 Allow for overriding container packagename for an Apex.
Test: go test ./... -test.v -run TestOverrideApex
BUG: 148198056
Change-Id: If49042a7acbf9f0dcb505664863d97805902e459
2020-03-16 12:38:06 -07:00
Automerger Merge Worker
82659e7ff7 apex: Deprecate legacy_android10_support prop am: 5417f775e5 am: 14b360507a am: 577e719117 am: 417420d29a am: acd40f47e5
Change-Id: Ia1ccd08b282b1645bd072a7269188acb4c0e7672
2020-03-16 05:47:16 +00:00
Automerger Merge Worker
577e719117 apex: Deprecate legacy_android10_support prop am: 5417f775e5 am: 14b360507a
Change-Id: I52872ae44fd2dfc9ef4a299aaf1412ec43e9fd8a
2020-03-16 05:06:18 +00:00
Jooyung Han
5417f775e5 apex: Deprecate legacy_android10_support prop
min_sdk_version = 29 implies that the module should support Android10.

Bug: 150431944
Test: m
Change-Id: Iad90a239898f59456900ae7816b90379b1b43406
2020-03-14 16:03:24 +09:00
Automerger Merge Worker
d56ca57756 Merge changes Iedcff7df,I4cb294c2 am: 001ca325fb am: c6b4caf37e am: 212de176a1 am: 4c09a06227 am: c381f138ea
Change-Id: Iaba9a793d1441942b3f70e016b83c702da89c365
2020-03-12 09:21:33 +00:00
Automerger Merge Worker
212de176a1 Merge changes Iedcff7df,I4cb294c2 am: 001ca325fb am: c6b4caf37e
Change-Id: Id1b12796c0e9ffe050820f295380271bfdab0f42
2020-03-12 08:39:05 +00:00
Automerger Merge Worker
8285cb7edd Merge "Remove special handling of test_ apexes" am: f53737fadc am: 784e2e472b am: 8aa853c134 am: 9aec4c5a38 am: 16f001278d
Change-Id: Ifff925320afe7d79de90d2b3399c39a9e8465ca3
2020-03-11 21:15:18 +00:00
Automerger Merge Worker
8aa853c134 Merge "Remove special handling of test_ apexes" am: f53737fadc am: 784e2e472b
Change-Id: I25af68ceb99b50d4d98a99a5af6143ddafcf5b58
2020-03-11 20:31:46 +00:00
Automerger Merge Worker
ebd4ff2305 Merge "Remove special handling of com.android.art.debug/release" am: de77904484 am: 0277cec3bd
Change-Id: I2441e873f40dfe9cc87cae39d0a980d917aa167e
2020-03-11 20:18:23 +00:00
Paul Duffin
7d74e7bea3 Copy white listed apex available settings into snapshot
Makes sure that the module snapshots do not rely on the white list
of apex available settings so that when those lists are removed it is
not necessary to update any snapshots.

Bug: 142935992
Test: m nothing
Change-Id: Iedcff7dfc2646a4da77258d16e06657dd2f411f9
2020-03-11 18:31:45 +00:00
Treehugger Robot
f53737fadc Merge "Remove special handling of test_ apexes" 2020-03-11 17:52:56 +00:00
Treehugger Robot
de77904484 Merge "Remove special handling of com.android.art.debug/release" 2020-03-11 16:46:21 +00:00
Paul Duffin
57380a902e Remove special handling of test_ apexes
Test apexes no longer check to see whether their contents are available
so the special handling is no longer necessary.

Bug: 142935992
Test: m nothing
Change-Id: Iecae7dcbb87908d19c672f74d3c1ed8810d4485b
2020-03-11 15:17:04 +00:00
Paul Duffin
50cbefd5e8 Remove special handling of com.android.art.debug/release
The whitelistedApexAvailable used to map references to
com.android.art.debug/release to com.android.art before looking it up
in the white list. This change removed that mapping and simply added
both to the white list.

Bug: 142935992
Test: m nothing
Change-Id: Ibad76fb73988688eb303e056197986ee9a6119ae
Merged-In: Ibad76fb73988688eb303e056197986ee9a6119ae
2020-03-11 15:16:47 +00:00
Automerger Merge Worker
806ba1dcac Fix path in apex when native_bridge_supported: true am: 35155c4f96 am: 42a3990433 am: aff9ac02b3 am: 281b502144 am: 3e62e45af8
Change-Id: Iacb8ef5f78bbe5274b569b2a7e609e44f575b656
2020-03-11 14:47:06 +00:00
Automerger Merge Worker
aff9ac02b3 Fix path in apex when native_bridge_supported: true am: 35155c4f96 am: 42a3990433
Change-Id: If476ee6e04813eb1dd685473101eb14c68b70e3b
2020-03-11 13:54:23 +00:00
Jooyung Han
35155c4f96 Fix path in apex when native_bridge_supported: true
NativeBridgeRelativePath should be appended after /bin or /lib and
before subdir.

Bug: N/A
Test: m (add a soong test)
Change-Id: Id0c44c66b4900caa291e816cf3361fdec8ff9421
2020-03-11 20:07:34 +09:00
TreeHugger Robot
c3a07b85ef Merge "Remove special handling of com.android.art.debug/release" 2020-03-11 05:27:21 +00:00
Automerger Merge Worker
884667ddaa Merge "Fix apex_available" am: 4c8e3509ee am: 192a8f7385 am: fe2d1c6a5a am: 5dc8942706 am: e18f38b4ee
Change-Id: I41e29808e869aaada17a487dc430890f12b9b7be
2020-03-11 01:07:10 +00:00
Automerger Merge Worker
fe2d1c6a5a Merge "Fix apex_available" am: 4c8e3509ee am: 192a8f7385
Change-Id: Iea3359013e011e79acee013f3ce9fc103ee8a166
2020-03-11 00:26:08 +00:00
Jooyung Han
4c8e3509ee Merge "Fix apex_available" 2020-03-10 23:53:41 +00:00
Jooyung Han
5e9013be22 Fix apex_available
Checking apex_available was missing some corner cases.
For example, the deps of share deps of cc_library modules are missed
while those from cc_library_shared are correctly tracked.

This was due to..

* calling DepIsInSameApex in WalkDeps: both work fine separately, but
when they are used together, it fails to work. It's due to how WalkDeps
works. (We might fix this bug too risky since it is used very widely)
* incorrect receiver for DepIsInSameApex in apex_deps mutator: receiver
is supposed to be parent, but child was used before. Interestingly lots
of deps are within the same group of module types(cc to cc, java to
java), it has worked. (note that receiver's DepIsInSameApex
implementation can be different).

This change fixes them by..

* walkPayloadDeps is now relying on ApexVariation, which is calculated
correctly by TopDown apex_deps mutator.
* use correct receiver for DepIsInSameApex in apex_deps mutator, which
requires for java.SdkLibrary to override the method and for
java.Library/Import to use passed dep instead of receiver to check its
membership of sdk.

Bug: 151071238
Test: build/boot
Change-Id: I0569ef4bb8e79635e4d97a89f421a8d8b7d26456
2020-03-10 23:52:01 +00:00
Paul Duffin
1ee6520b28 Remove special handling of com.android.art.debug/release
The whitelistedApexAvailable used to map references to
com.android.art.debug/release to com.android.art before looking it up
in the white list. This change removed that mapping and simply added
both to the white list.

Bug: 142935992
Test: m nothing
Change-Id: Ibad76fb73988688eb303e056197986ee9a6119ae
2020-03-10 21:52:32 +00:00
Treehugger Robot
04c93a40f1 Merge "DO NOT MERGE: Remove AppSearch from Android R." 2020-03-10 08:19:05 +00:00
Jiyong Park
65cc4f7777 Apex_available check failure reveals dependency
When the check for apex_available has failed, the build system now shows
the module that brought the unavailable module into the APEX.

Bug: 151051671
Test: m
Merged-In: Id1a3fda67fe56fdc2dc90ec800d10689415de4d6
(cherry picked from commit 7bd9444b0f)
Change-Id: Id1a3fda67fe56fdc2dc90ec800d10689415de4d6
2020-03-09 18:56:54 +09:00
Automerger Merge Worker
163da2de58 Merge "Apex_available check failure reveals dependency" into rvc-dev am: 5a3899b5c5 am: 0c9541f6f6 am: 6dd35a3215 am: 7a6b460571
Change-Id: Ib28418618839f2574a71c18632f82d7928cfd7f6
2020-03-09 09:47:16 +00:00
Automerger Merge Worker
6dd35a3215 Merge "Apex_available check failure reveals dependency" into rvc-dev am: 5a3899b5c5 am: 0c9541f6f6
Change-Id: I3b3ce6c8df1390fd12f8ac96468afb8544de17fe
2020-03-09 09:23:57 +00:00
Automerger Merge Worker
62cdc4ad57 Merge "Apex_available check failure reveals dependency" into rvc-dev am: 5a3899b5c5
Change-Id: I683d10496836a77d5140031daae27ac71a83c76f
2020-03-09 09:01:38 +00:00
Alexander Dorokhine
466d39a18c DO NOT MERGE: Remove AppSearch from Android R.
Test: presubmit
Bug: 150249538
Merged-In: I0a87b9d893bc76acf5ac5e8684f450b9a4f2a0cd
(cherry picked from commit c9c7116721)
Change-Id: I0a87b9d893bc76acf5ac5e8684f450b9a4f2a0cd
2020-03-09 15:14:42 +09:00
Jiyong Park
7bd9444b0f Apex_available check failure reveals dependency
When the check for apex_available has failed, the build system now shows
the module that brought the unavailable module into the APEX.

Bug: 151051671
Test: m
Change-Id: Id1a3fda67fe56fdc2dc90ec800d10689415de4d6
2020-03-09 14:29:18 +09:00
Automerger Merge Worker
088ba44801 apex: choose stub according to min_sdk_version am: 03b5185b88 am: 5cf1805a44 am: 344ce5f777 am: 305ffc08d7 am: 964001b0be
Change-Id: I1d881aaca6f7121c277368ad3459485c10d52f56
2020-03-06 20:51:18 +00:00
Automerger Merge Worker
344ce5f777 apex: choose stub according to min_sdk_version am: 03b5185b88 am: 5cf1805a44
Change-Id: Ibe1984b4deaa0681a7339f871d8d3dc62072fe58
2020-03-06 20:13:50 +00:00
Jooyung Han
03b5185b88 apex: choose stub according to min_sdk_version
Native modules within APEX should be linked with proper stub version
according to its min_sdk_version.

For example, when min_sdk_version is set to "29", libfoo in the apex
would be linked to libbar of version 29 from platform, even if it has
a newer version like 30.

Bug: 145796956
Test: m nothing (soong tests)
Change-Id: I4a0b2002587bc24b7deeb5d59b6eeba5e1db5b1f
2020-03-07 03:12:45 +09:00
Automerger Merge Worker
0d2697146b DO NOT MERGE: Remove AppSearch from Android R. am: c9c7116721
Change-Id: I64870bfc6e92d288ef45ef1194a170ed44e70c2e
2020-03-06 09:37:42 +00:00
TreeHugger Robot
bc4df10016 Merge "DO NOT MERGE: Remove AppSearch from Android R." into rvc-dev 2020-03-05 21:09:00 +00:00
Colin Cross
7365eaafd5 Add min_sdk_version property to apexes
Add a min_sdk_version property apexes.  Currently a noop, but will
be used to enforce that dependencies are compatible with the
specified version.

Test: m checkbuild
Bug: 149591522
Merged-In: I923773c90fe15becbffae3986791aa9edde8f8f6
Change-Id: I923773c90fe15becbffae3986791aa9edde8f8f6
(cherry picked from commit 50317874ff)
2020-03-05 14:40:28 +09:00
Jiyong Park
af8998cba6 bundle config contains (path,manifest) pairs of embedded APKs
If an APEX contains APKs and the manifest package name of the APKs are
overridden (either via override_android_app
orPRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES), that the path to the APK
(relative in the APEX) and the overridden manifest package name is
recorded in the bundle config file.

Exempt-From-Owner-Approval: cherry-pick from master

Bug: 148002117
Test: m

Merged-In: Ibb90bcefb77fa6b2dad77cb2facc6079de9ab154
(cherry picked from commit cfaa1643e8)
Change-Id: Ibb90bcefb77fa6b2dad77cb2facc6079de9ab154
2020-03-01 03:59:11 +00:00
Automerger Merge Worker
3a58ea25c2 bundle config contains (path,manifest) pairs of embedded APKs am: cfaa1643e8 am: 9cb0071b9e
Change-Id: I1894098b8073f6ad0d83aa957a8bd4c149e904d2
2020-02-29 09:53:07 +00:00
Jiyong Park
cfaa1643e8 bundle config contains (path,manifest) pairs of embedded APKs
If an APEX contains APKs and the manifest package name of the APKs are
overridden (either via override_android_app
orPRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES), that the path to the APK
(relative in the APEX) and the overridden manifest package name is
recorded in the bundle config file.

Bug: 148002117
Test: m

Change-Id: Ibb90bcefb77fa6b2dad77cb2facc6079de9ab154
2020-02-29 09:07:46 +09:00
Automerger Merge Worker
d8c70e3f73 Merge "Add "jni_libs" property to apex module" am: c6e538406c am: 77de0c97a0
Change-Id: Ic6c20b4b5e8334f6fe5532f6da3d29797731620c
2020-02-28 17:32:43 +00:00
Automerger Merge Worker
eed20ed32a Merge changes I789b526c,Ie15c811f am: 6e147e4f54 am: 450510faa7
Change-Id: I5e1d927f6f586010ef59d5f3ff1c14b6273bf8f4
2020-02-28 17:32:35 +00:00
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
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
Automerger Merge Worker
c93ba028ea Merge "No symlink for host APEXes" into rvc-dev am: 73fa54e7a4
Change-Id: I8c02e7d52eadd32eb3f30514b3ab6f7c596a4919
2020-02-27 03:35:27 +00:00
Jiyong Park
73fa54e7a4 Merge "No symlink for host APEXes" into rvc-dev 2020-02-27 03:22:01 +00:00