Commit Graph

1348 Commits

Author SHA1 Message Date
Jiyong Park
61b5d0672d Revert "Don't build hiddenapi flags or encode dex for unbundled builds"
am: 09cb629c15

Change-Id: I13583e6b4e6c59c2c2904349f61179a49a0a36ba
2019-07-15 15:20:14 -07:00
Jiyong Park
09cb629c15 Revert "Don't build hiddenapi flags or encode dex for unbundled builds"
This reverts commit 7b8a567f44.

Bug: 137282010
Test: With the CL above this one, the unbundled mainline module build
does not fail.

Change-Id: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17
2019-07-15 17:17:31 +09:00
Jaewoong Jung
9c7c376566 Merge "Add java_sdk_library summary to soong docs."
am: 66abc58aa2

Change-Id: Id4dd68586b94cc9873cec36140e9a6078fdbbe95
2019-07-11 14:29:59 -07:00
Treehugger Robot
66abc58aa2 Merge "Add java_sdk_library summary to soong docs." 2019-07-11 20:59:35 +00:00
Jaewoong Jung
4f158eed0d Add java_sdk_library summary to soong docs.
Test: m soong_docs
Change-Id: Ibaf09cd263966fad90d22d2b17161432c247cbbb
2019-07-11 10:45:40 -07:00
Sasha Smundak
e26ae3f2bf Merge "Tune invocations and print full diagnostics on crash for d8 and r8."
am: a89cf59a4f

Change-Id: I9afd4b5af3119e57bbd21ed1e42c340ca35d1962
2019-07-10 13:45:01 -07:00
Treehugger Robot
a89cf59a4f Merge "Tune invocations and print full diagnostics on crash for d8 and r8." 2019-07-10 19:59:11 +00:00
Jaewoong Jung
c40949db97 Merge "Improve android_app_import.dpi_variants handling."
am: 3af8661af7

Change-Id: Iafb8f55dac9caaa3acb3d6fc46f0ad8452147660
2019-07-10 09:57:24 -07:00
Jaewoong Jung
3af8661af7 Merge "Improve android_app_import.dpi_variants handling." 2019-07-10 16:39:53 +00:00
Jaewoong Jung
3e18b19442 Improve android_app_import.dpi_variants handling.
Instead of circumventing the limitation of Prebuilt implementation by
picking a source path itself, it now uses the same mechanism as
archMutator and replaces the source path in advance so that Prebuilt
always sees the corrent source path.

Because this requires the Apk field to be a string pointer, the single
source prebuilt implementation is being updated to be reflection-based.

Test: Soong unit tests, m soong_docs, TreeHugger
Change-Id: I2304f15e32d632f74f95f0d9e9bf1f75ff3e2225
2019-07-09 15:00:15 -07:00
Sasha Smundak
ee5c60384f Tune invocations and print full diagnostics on crash for d8 and r8.
Bug: 132766811
Test: treehugger
Change-Id: Id6943008e65b9dc3479e8758445e8d679529a8cb
2019-07-09 11:26:20 -07:00
Jaewoong Jung
f0cb835ebf Merge "Dist NOTICE outputs for app targets."
am: b1907ee587

Change-Id: I3f33053028a9564d42b9ce2b18fdfa5ff8a760c8
2019-07-08 17:12:15 -07:00
Jaewoong Jung
9877279855 Dist NOTICE outputs for app targets.
Bug: 136501164
Test: m NetworkStack, TreeHugger
Change-Id: I2279eeb0e50b1b5685e23130a8da6ab090f37f56
2019-07-08 09:26:02 -07:00
Jeongik Cha
218964e76e Merge "Enforce hidden api usage in vendor (soong)" am: e65d84c84c
am: 7a22534a47

Change-Id: Iffbacc0f98fb208e6f71919bcefa19cb0e57efca
2019-06-30 19:53:19 -07:00
Treehugger Robot
e65d84c84c Merge "Enforce hidden api usage in vendor (soong)" 2019-07-01 02:06:57 +00:00
Jeongik Cha
6bd33c13bb Enforce hidden api usage in vendor (soong)
From aosp/588578, if vendor app doesn't fill sdk_version, build scirpt overwrites system_current to sdk_version.
But there is no similar enforcement in soong.

So, as make does, sdkVersion() returns "system_current" if it is device-specific or soc-specific module. and sdk_version is not filled.

Test: pass soong test
Bug: 132780927

Change-Id: I69bb3d7bfcf7c27c2db4d0efbe046f9c7879b4bc
2019-06-28 14:56:59 +09:00
Mathieu Chartier
f137467b49 Merge "Revert "Revert "Remove option to create boot image based on preloaded classes""" am: 8a255acae2
am: abbcf54625

Change-Id: I65f5927b59ebb4d8999fe4e31a10fd9bcd192063
2019-06-27 09:33:28 -07:00
Mathieu Chartier
8a255acae2 Merge "Revert "Revert "Remove option to create boot image based on preloaded classes""" 2019-06-27 15:56:52 +00:00
Paul Duffin
eebd76179f Merge "core_current does not include framework libraries" am: bf46d96c60
am: 3704c26631

Change-Id: Ia24a9ceef1cf09fc61f1073e91acfbf7d2d48749
2019-06-27 05:22:14 -07:00
Paul Duffin
bf46d96c60 Merge "core_current does not include framework libraries" 2019-06-27 11:43:32 +00:00
Mathieu Chartier
6adeee1131 Revert "Revert "Remove option to create boot image based on preloaded classes""
Test: make
Test: build/soong/scripts/build-ndk-prebuilts.sh

This reverts commit d3f688b521.

Change-Id: Ia8898d11d67e5f0c4d8886f13d29f5dbd5f8609b
2019-06-26 14:54:47 -07:00
Colin Cross
6e07ef95ef Merge "Don't pass --legacy by default to aapt2 compile" am: b2e4f475c3
am: 2eda0f6f5d

Change-Id: I3e5a027c57de092e9748ede5fc3366e26f643cc9
2019-06-26 11:36:40 -07:00
Paul Duffin
de24d21f87 Merge "Remove unused condition in decodeSdkDep(...)" am: 25bdad9f2c
am: ee9d638968

Change-Id: Ib5e3b295b3ea7f471da697d22ef6620701225745
2019-06-26 10:56:00 -07:00
Mathieu Chartier
ec53d83a95 Merge "Revert "Remove option to create boot image based on preloaded classes"" am: a6c4ff2cc8
am: c286a25894

Change-Id: I2ea16e342d9bea29cf98ab6ed277a7654861eb29
2019-06-26 10:52:54 -07:00
Colin Cross
b2e4f475c3 Merge "Don't pass --legacy by default to aapt2 compile" 2019-06-26 17:05:34 +00:00
Mathieu Chartier
a6c4ff2cc8 Merge "Revert "Remove option to create boot image based on preloaded classes"" 2019-06-26 16:52:45 +00:00
Mathieu Chartier
af939a71e2 Merge "Remove option to create boot image based on preloaded classes" am: e2a8e7f0ec
am: 26f8e25cc1

Change-Id: I0d76c25c482be86090bf4666e4633ffa9059a24d
2019-06-26 09:50:37 -07:00
Mathieu Chartier
d3f688b521 Revert "Remove option to create boot image based on preloaded classes"
This reverts commit 4a0473175e.

Reason for revert: NDK build broken

Change-Id: Id98bf9d5f82ed72d8c489264cf9d754e8ea1d27e
2019-06-26 16:44:38 +00:00
Mathieu Chartier
e2a8e7f0ec Merge "Remove option to create boot image based on preloaded classes" 2019-06-26 15:56:36 +00:00
Paul Duffin
7aae6e7794 core_current does not include framework libraries
Bug: 134566750
Test: m droid
Change-Id: I9496a121e28fabe0c60959ac8ccea60ec4b58544
2019-06-26 14:38:00 +01:00
Paul Duffin
735d03c65c Remove unused condition in decodeSdkDep(...)
The string "core.platform.api.stubs" is never passed to the toModule
function since change I6bb6c1a0ea24437c8253dc5d8fabd37edabc9d3e.

Bug: 134566750
Test: m droid
Change-Id: Ia425a433cd762bba30be72e837fa4199580e5b6c
2019-06-26 14:37:31 +01:00
Colin Cross
f5300d729e Merge "Uncompress dex in unbundled privileged apps" am: 49eb5477c7
am: d7f9313e5b

Change-Id: I2f9baa99918d5730af3f7df1fc0671d4b6644ebe
2019-06-25 18:54:13 -07:00
Mathieu Chartier
4a0473175e Remove option to create boot image based on preloaded classes
From now on, the only supported approach is to use a boot image profile.

Test: make

Change-Id: Ibd8fbd1dd81db0a7b3f3b3e626a70dcc26510224
2019-06-25 15:38:25 -07:00
Colin Cross
53a87f523b Uncompress dex in unbundled privileged apps
Mainline builds privileged apps unbundled and then uses them as
prebuilts, so they need to respect the privileged flag when
deciding whether or not to uncompress the dex.

Bug: 135772877
Test: TestUncompressDex
Change-Id: I91da7116b779ae35c0617ef77dbcb9788902370c
2019-06-25 13:36:46 -07:00
Jaewoong Jung
a4d59ff0b5 Optionally embed NOTICE files in apks. am: 5b425e2e20
am: 5d48965fed

Change-Id: I533808f0eafb496c34ece9d100784ebb9b5257e6
2019-06-25 10:03:31 -07:00
Jaewoong Jung
5d48965fed Optionally embed NOTICE files in apks.
am: 5b425e2e20

Change-Id: I0397838781d5ce7ba20778706d3b0ee4936080e8
2019-06-25 09:59:31 -07:00
Jaewoong Jung
50c744e916 Merge changes from topic "apex_notice"
* changes:
  Embed NOTICE output as an APEX asset.
  Optionally embed NOTICE files in apks.
2019-06-25 16:41:16 +00:00
Jaewoong Jung
5b425e2e20 Optionally embed NOTICE files in apks.
If embed_notices or ALWAYS_EMBED_NOTICES is set, collect NOTICE files
from all dependencies of the android_app, merge them with the app's own
one (if exists), transform it to HTML, gzip it, and put it as an asset
in the final APK output.

Bug: 135460391
Test: app_test.go
Change-Id: I52d92e2fd19b3f5f396100424665c5cc344190d8
2019-06-24 19:10:22 -07:00
Paul Duffin
b5be0c72ee Remove the no_framework_libs property am: 5c2f963a1d
am: 334a008188

Change-Id: I6b2d63eca5c78599115c6d9a431f22e99fe7709c
2019-06-24 16:38:34 -07:00
Colin Cross
f8f6c5ed6a Merge "Allow passing --legacy in aaptflags" am: 84338df001
am: e4bcefdbee

Change-Id: Ie55ebc817c3f68612650549a8562cc72b9abe820
2019-06-24 08:56:13 -07:00
Paul Duffin
5c2f963a1d Remove the no_framework_libs property
Corrects an error message that refers to no_framework_libs.

Removes any tests that use no_framework_libs:true where possible as
there are duplicate tests for sdk_version:"core_platform". Otherwise,
switches them over to use sdk_version:"core_platform".

Bug: 134566750
Test: m droid
Change-Id: I41abe1a49f5c744e3393ca9cdf0c41888f810c9f
2019-06-24 16:03:56 +01:00
Treehugger Robot
84338df001 Merge "Allow passing --legacy in aaptflags" 2019-06-24 00:59:15 +00:00
Colin Cross
4215cfd8f9 Don't pass --legacy by default to aapt2 compile
Don't pass --legacy by default, it is rarely necessary and converts
some errors into warnings that crash at runtime.  The modules that
need it have had --legacy added to aaptflags.

Bug: 135597368
Test: m java
Change-Id: Ib05a07ead4084dd32ba28df26708d81bb53f2f2a
2019-06-22 13:04:30 -07:00
Colin Cross
a0ba2f5858 Allow passing --legacy in aaptflags
--legacy will soon no longer be passed by default to all aapt2
compiles.  Allow it to be specified in aaptflags by passing it to
aapt2 compile when it is present and filtering it out from the
flags passed to aapt2 link.

Bug: 135597368
Test: m java
Change-Id: Ib65d1a9b7c32ae4ff5ab6f58e66aedfb5f296712
2019-06-22 12:59:27 -07:00
Dan Willemsen
51ff37cbb4 Fix typo in java system modules makevars am: fe310be720
am: 43ed1dbcad

Change-Id: I26bcb27fbcf43911ae636549fb21f8ff106ab817
2019-06-20 16:16:10 -07:00
Dan Willemsen
fe310be720 Fix typo in java system modules makevars
This was preventing us from actually using system module dependencies
from Make.

Fixes: 135679136
Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true m legacy-performance-test-hostdex
Change-Id: Ic51c30d09cf39e35f2fe5f534a23273f450d9138
2019-06-20 10:17:35 -07:00
Dan Willemsen
7430c9df16 Merge changes from topics "rbe-deps-dexpreopt-images", "rbe-deps-system-modules" am: f8a698a0c6
am: 1a3968269d

Change-Id: Ib05695ec6e8d7fdabf4ffeca2d2f037880aad2ce
2019-06-18 16:26:19 -07:00
Dan Willemsen
dbfe69e934 Depend on all the files from system modules am: ff60a73d89
am: fde13865d6

Change-Id: Ifdc822d3ae118bb3a46302f521115a0b032a0a03
2019-06-18 16:25:45 -07:00
Dan Willemsen
fde13865d6 Depend on all the files from system modules
am: ff60a73d89

Change-Id: I765b9bccd7ea8a07c99a7bc360cf58405b3c966d
2019-06-18 16:08:06 -07:00
Treehugger Robot
f8a698a0c6 Merge changes from topics "rbe-deps-dexpreopt-images", "rbe-deps-system-modules"
* changes:
  Expand the dexpreopt image dependencies to entire image
  Depend on all the files from system modules
2019-06-18 22:48:22 +00:00