StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,140 Commits 1 Branch 0 Tags
35ca6bc67fb723636f7671745d5fb6ddfb97992f
Commit Graph

6136 Commits

Author SHA1 Message Date
Muhammad Haseeb Ahmad
35ca6bc67f Merge "Make IsSanitizerEnabledForJni return false" am: 53a129db89 am: e353655540 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2105764

Change-Id: Icb9a49ce6817fe2f7fa6a6d35b6b2345cd07035c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 06:59:42 +00:00
Muhammad Haseeb Ahmad
e6567fe56b Make IsSanitizerEnabledForJni return false 
Change-Id: I5e1722bc32b63649fc9973d11e9fd5bdea72ddbe
Test: m
 2022-05-25 00:13:08 +00:00
Sorin Basca
ec9d37f146 Merge "Add experimental option to target Java 17" am: 78ce8c23de am: a571b7d389 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104326

Change-Id: Iac56194ce46c845e0498e0fb794f4eb29895d78e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 16:10:38 +00:00
Sorin Basca
ce720c3663 Add experimental option to target Java 17 
Bug: 233029164
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_17=true \
      EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN=true m
Change-Id: I80a9ba9eb356a460c1036e711e793c2ca6620f53
 2022-05-24 13:05:17 +01:00
Treehugger Robot
a2a665b40e Merge "Clean up some bp2build technical debt" am: 5bec8d41ea am: d5c19f1eb9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075729

Change-Id: Ia782f52cc1dfb7a43cef80f8fd374160b0208526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 18:53:44 +00:00
Treehugger Robot
5bec8d41ea Merge "Clean up some bp2build technical debt" 2022-05-23 18:01:04 +00:00
Treehugger Robot
d4899ce231 Merge "Revert "Use D8 by default for android_test"" am: 14b500daba am: 1e2e5fcb73 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100965

Change-Id: I263ec410fc4a118374989d16e0fadee30d9ddf63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 06:20:25 +00:00
Treehugger Robot
14b500daba Merge "Revert "Use D8 by default for android_test"" 2022-05-23 05:49:40 +00:00
Jared Duke
4e445be558 Revert "Use D8 by default for android_test" 
This reverts commit 02edc10047.

Reason for revert: Breaks test_suites_x86_64_coverage

Bug: 233421462
Change-Id: I7b04d3fd7802be0f271ea3c29ef25e3d08ab1389
 2022-05-23 04:00:44 +00:00
Bob Badour
efdf8ab4cc Fix bug: allow multiple gen_notice modules. am: a5ea2479d3 am: d9771dedbb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098696

Change-Id: I921b541c513779e4a73a70876a9ffff23e4361f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 03:22:39 +00:00
Bob Badour
a5ea2479d3 Fix bug: allow multiple gen_notice modules. 
Test: m cts dist reportmissinglicenses

Change-Id: I07963c83eaddfe363a04871e813b56fe7f1465ad
 2022-05-20 16:54:00 -07:00
Treehugger Robot
7158bc6012 Merge "Use D8 by default for android_test" am: 1811ed3764 am: db7ee090e1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097291

Change-Id: I898a3308b5fe5d7477a261fc4d20871f5cacb01d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 23:23:50 +00:00
Treehugger Robot
1811ed3764 Merge "Use D8 by default for android_test" 2022-05-20 22:46:15 +00:00
Jared Duke
02edc10047 Use D8 by default for android_test 
android_test defaults to using R8, but with shrinking, optimization and
obfuscation disabled, eliminating most of the benefits of R8. Instead,
use D8 by default, improving build performance and avoiding any other
issues that may arise in test-specific code related to whole-program R8
execution. An initial audit shows that android_test targets that *do*
enable shrinking or optimization also explicitly opt in to R8.

A follow-up CL will do the same for android_test_helper_app, but that
requires some additional auditing of downstream targets.

Bug: 192032291
Test: m + presubmit
Change-Id: I5b14a0986dde210f241a77c3a93daacf9e53d667
 2022-05-20 12:02:13 -07:00
Paul Duffin
0ccfe77dd3 Merge "Add custom java_sdk_library info to the SDK info file" am: e73d52cb9b am: e917d3ae4c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096802

Change-Id: I27a97a5b6477fe25ce3aafbe8bbdb9ebe2e0bd52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 16:15:25 +00:00
Paul Duffin
e73d52cb9b Merge "Add custom java_sdk_library info to the SDK info file" 2022-05-20 13:59:19 +00:00
Colin Cross
7065be231c Merge "Don't call dexpreopter methods on host modules" am: 6c04c66b7e am: e00639d4ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1908174

Change-Id: I6f0685edfd6f809f9839a4063ca2c5608b9f008e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 21:13:50 +00:00
Colin Cross
6c04c66b7e Merge "Don't call dexpreopter methods on host modules" 2022-05-19 20:46:23 +00:00
Bob Badour
00d6beecc9 Merge "Add gen_notice module." am: 335a4333fe am: 15aba3f5e0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095028

Change-Id: I56c39b0693a8a18b6e43f0536c724e5b26338504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 19:09:45 +00:00
Bob Badour
335a4333fe Merge "Add gen_notice module." 2022-05-19 18:03:09 +00:00
Bob Badour
eef4c1c563 Add gen_notice module. 
Refactor notices to support notices for multiple modules.

Enforce visibility and handle missing dependencies.

Bug: 213388645

Change-Id: Id6a81987f087419ad37d0cce57a71e8a7c4cd6e0
 2022-05-18 16:38:19 -07:00
Lukács T. Berki
5258c42167 Merge "Make java_fuzz_host not implement Sanitizeable." am: 53c6c67cbb am: 2928c292e6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096734

Change-Id: I1827cc21a64596be2af5760519d755c078658383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 07:33:06 +00:00
Lukács T. Berki
53c6c67cbb Merge "Make java_fuzz_host not implement Sanitizeable." 2022-05-18 06:43:42 +00:00
Treehugger Robot
9f2eab6462 Merge "Fix prebuilts of overridden apps" am: 822029166d am: 7a8e610703 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2099730

Change-Id: Ib50d77543a68c07a7c1f2391225132cf0c91b57a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-17 21:19:07 +00:00
Colin Cross
61df14acce Don't call dexpreopter methods on host modules 
Only call the dexpreopter methods on device modules so broken
dexpreopt configs don't break host-only unbundled builds.

Bug: 207813628
Test: tradefed branch builds
Change-Id: I41deb765a29c5cef9130a4d26aad7f956f75cdd5
 2022-05-17 13:15:39 -07:00
Treehugger Robot
822029166d Merge "Fix prebuilts of overridden apps" 2022-05-17 19:03:42 +00:00
Lukacs T. Berki
8c77ae369a Make java_fuzz_host not implement Sanitizeable. 
Also remove a tiny bit of state mutation from sanitizerMutator. Every
little bit helps!

Test: Prebuilts + comparing soong/build.ninja .
 Your branch is up to date with 'aosp/master'.

Change-Id: I73b28b660b572610242765d87b70ab081b0b43df
 2022-05-17 11:25:28 +02:00
Treehugger Robot
7583481570 Merge "Make "overrides" attribute of Android_app overridable" 2022-05-17 06:38:19 +00:00
Colin Cross
aaa0c1ffcd Fix prebuilts of overridden apps 
AndroidApp had its own HideFromMake method and flag that shadowed
the one in ModuleBase.  This caused performOverrideMutator to set the
AndroidApp flag, but ModuleBase.skipInstall to read the ModuleBase
flag, resulting in a conflicting install rule being created.  Remove
AndroidApp's HideFromMake in favor of the ModuleBase one.

Bug: 232788722
Test: TestOverrideAndroidAppWithPrebuilt
Change-Id: I8c0dfcb50ff4dc1e4d0574f150b10d79908f46aa
 2022-05-16 18:27:00 -07:00
zhidou
198f589222 Make "overrides" attribute of Android_app overridable 
Move overrides attribute from appProperties to overridableAppProperties

Bug: 220029162
Test: m
Change-Id: I6f527df3173f142311734333ad37018c83d5e279
Merged-In: I6f527df3173f142311734333ad37018c83d5e279
(cherry picked from commit a2ce78f80d)
 2022-05-16 18:26:52 -07:00
Paul Duffin
958806b8c8 Add custom java_sdk_library info to the SDK info file 
Previously the SDK info file only contained basic common information
about each member. This change adds support for each member to
provide custom information to add to the info file.

It uses that mechanism to add the following:
* "dist_stem"
* "scopes" object containing:
  * for each scope a:
    "<scope>" object containing:
    * "current_api" - the path within the snapshot for the API's .txt
                      file.
    * "removed_api" - the path within the snapshot for the removed
                      API's .txt file.
    * "latest_api" - the path within the build to the latest finalized
                     API .txt file.
    * "latest_removed_api" - the path within the build to the latest
                             finalized removed API .txt file.

In order to access the latest API files it was necessary to add and
resolve dependencies on the module that makes them available. In order
to do that safely the code for creating the names of the modules was
refactored to avoid duplicating the name creation logic.

Bug: 204763318
Test: m nothing
Change-Id: Ica68abbd2b2c7c2b2b7877b502f96cc89f06fd68
 2022-05-16 17:09:10 +00:00
Liz Kammer
3bf97bd1c0 Clean up some bp2build technical debt 
Previously we ran mutators in bp2build mode to add dependencies, now we
look up modules by name directly. Remove workarounds to allow bp2build
mode to not fail when adding/handling dependencies.

Test: m bp2build
Change-Id: Ibf6fd905150cac306e5c395902ef28f609f4df2a
 2022-05-13 19:47:48 -04:00
Sam Delmerico
c4eb800be1 Merge "disable usage of plugins as static libs" am: 1cb1c45e8c am: ec2519b0b9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076860

Change-Id: Ic840d8ddbfe8bc7c372ec911a560533809974a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:30:07 +00:00
Sam Delmerico
1cb1c45e8c Merge "disable usage of plugins as static libs" 2022-05-13 17:57:15 +00:00
Thiébaud Weksteen
61aacdad9b Merge "java/lint: enable lint on non-generated srcjar" am: 5471f4ea83 am: 161080466b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2086850

Change-Id: I861533e0e24e854f2ad9cc0103bf333b5111c25a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 07:22:46 +00:00
Thiébaud Weksteen
5471f4ea83 Merge "java/lint: enable lint on non-generated srcjar" 2022-05-12 06:26:41 +00:00
Treehugger Robot
904e8d18f0 Merge "Ensure that *bootclasspath* module types depend on device variants" am: 1a6305f9e0 am: 9bc494bc08 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095251

Change-Id: Ia0a25286a2d5d3b4861f3a91d529fe52655fc68e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:49:39 +00:00
Treehugger Robot
da3b642bf5 Merge "convert java_resources with bp2build" am: 2737c25e9e am: ff063f97fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042845

Change-Id: I674693e21d9098ad9f185f394ee055dfac6869af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:49:27 +00:00
Sorin Basca
9bf8eb89da Merge "Strip annotations from library stubs" am: 61c6eef064 am: 12dd25adda 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092623

Change-Id: I05e2c8f527e3f38139d0bb6b9d8c75e27a61570c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:49:08 +00:00
Anton Hansson
ddbf242004 Merge "Use lint database from api_versions_public" am: b82b392423 am: 17094ecba8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092228

Change-Id: Ie5447a6494befbc1ace3f1938181658b2cd79d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:48:08 +00:00
Spandan Das
f454194692 Merge changes Ie8881b85,I6c064f8a am: f923333a93 am: e41be189f0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2090231

Change-Id: I1eebfc246a05fdb728d1c9460f322f657f7d36df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:47:28 +00:00
Anton Hansson
3bc0cdc239 Merge "Support using api-versions.xml from another module" am: 4d92d831ca am: 63c05717b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092227

Change-Id: I5265bd5e426cbe14371044a83c46c6a4517de82d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:46:56 +00:00
Anton Hansson
3f2e8ce166 Merge "Use merged annotations zip for lint" am: 3881e8d7fb am: 58729fada2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092226

Change-Id: I553a73673be5fb34c4c6756809611d61c93856ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:46:46 +00:00
Anton Hansson
15d071f64b Merge "Write AndroidMk for api-versions.xml module" am: 55c157791e am: adfab19c93 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092225

Change-Id: Id3fab7a78bd098d0c7fa4e915e26634a9eb2ffa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:46:33 +00:00
Treehugger Robot
1a6305f9e0 Merge "Ensure that *bootclasspath* module types depend on device variants" 2022-05-11 20:43:30 +00:00
Treehugger Robot
2737c25e9e Merge "convert java_resources with bp2build" 2022-05-11 19:58:48 +00:00
Paul Duffin
b2c2173bfd Ensure that *bootclasspath* module types depend on device variants 
Needed to allow change https://r.android.com/2089503 to be reapplied.

Bug: 232106778
Test: Apply the change and then run
      m EMMA_INSTRUMENT=true nothing
Change-Id: I92d19c51cc828295ba13951e65911db707f0f2ba
 2022-05-11 15:20:37 +00:00
Sorin Basca
61c6eef064 Merge "Strip annotations from library stubs" 2022-05-11 13:46:25 +00:00
Anton Hansson
b82b392423 Merge "Use lint database from api_versions_public" 2022-05-11 08:11:45 +00:00
Sorin Basca
69f4b082b9 Strip annotations from library stubs 
Bug: 222743634
Test: m
Change-Id: Ic44bd7c4c163b723295eb369664432d3651b8597
 2022-05-10 19:41:59 +01:00