Commit Graph

54041 Commits

Author SHA1 Message Date
Liz Kammer
0436c6a2e9 bp2build remove "-std" from cflags am: cac7f690eb am: 547bdc5207 am: 7b901cb0fb am: 091e30666e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927501

Change-Id: I169b195e9b38333a9184d9df0510510830032277
2021-12-21 19:40:29 +00:00
Liz Kammer
091e30666e bp2build remove "-std" from cflags am: cac7f690eb am: 547bdc5207 am: 7b901cb0fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927501

Change-Id: I468f8accaaf37502c10e0392e217d56ce016c551
2021-12-21 19:19:00 +00:00
Liz Kammer
7b901cb0fb bp2build remove "-std" from cflags am: cac7f690eb am: 547bdc5207
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927501

Change-Id: Iff51c739365eb8f70f2be6628a50dda504061302
2021-12-21 19:06:11 +00:00
Liz Kammer
547bdc5207 bp2build remove "-std" from cflags am: cac7f690eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927501

Change-Id: I772ce27bb6bcc2ada05363924477566ab3b96c6f
2021-12-21 18:53:16 +00:00
Liz Kammer
cac7f690eb bp2build remove "-std" from cflags
Soong overrides "-std" flags when provided via cppflags or conlyflags;
however, any user-provided "-std=" cflag will be overridden by Soong's
std flag handling.

For Bazel, we _always_ allow user to override via user provided flags.
To prevent conflicts, we remove the silently ignored values from
Android.bp files in the bp2build conversion.

Test: build/bazel/ci/bp2build.sh
Test: build/bazel/ci/mixed_droid.sh
Change-Id: I4c33b2ae593a7ff3ff8e3ad15ef3461354fc0c83
2021-12-21 11:49:01 -05:00
Liz Kammer
d5850a8e96 Merge "Fix typo in bp2build denylist." am: 5166a1c707 am: 1acfbe98bb am: 3f304d2d7e am: cc3dd1e941
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927621

Change-Id: I20f6a623f013596639b8b1bfe1680d86ab496f03
2021-12-21 16:44:24 +00:00
Liz Kammer
cc3dd1e941 Merge "Fix typo in bp2build denylist." am: 5166a1c707 am: 1acfbe98bb am: 3f304d2d7e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927621

Change-Id: I1851b0606a2707f8b78b3aff5787e4134e8cfdd8
2021-12-21 16:31:48 +00:00
Liz Kammer
3f304d2d7e Merge "Fix typo in bp2build denylist." am: 5166a1c707 am: 1acfbe98bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927621

Change-Id: Ia75e1692c6462e9d9fb4b1b0fa09e5ecee7e3e9b
2021-12-21 16:20:21 +00:00
Liz Kammer
1acfbe98bb Merge "Fix typo in bp2build denylist." am: 5166a1c707
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927621

Change-Id: I1cea5857b57e2b72f73d6fc35ee7bcaf0c3986be
2021-12-21 16:02:32 +00:00
Liz Kammer
5166a1c707 Merge "Fix typo in bp2build denylist." 2021-12-21 15:44:27 +00:00
Treehugger Robot
71e90ca2b0 Merge "Pass --write-reference-baseline to lint" am: 430059b422 am: dd0667e31d am: beb984e0cd am: c409bf5b43
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1822276

Change-Id: Ia7422df3e1ddb300bfe439e5deb7f72a430d4766
2021-12-21 09:45:27 +00:00
Yuntao Xu
13f75e3d8f Merge "Support LOCAL_CHECK_ELF_FILES in androidmk tool" am: 38a5faf639 am: 93127aea3e am: 652ba3ad1c am: af4f0b64ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1926780

Change-Id: Ibcb2f857d94ad8ceabebebff062b73e4b17050b3
2021-12-21 09:45:13 +00:00
Treehugger Robot
c409bf5b43 Merge "Pass --write-reference-baseline to lint" am: 430059b422 am: dd0667e31d am: beb984e0cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1822276

Change-Id: I0d80229617070da8e31e9859f4a23a70234e8c3e
2021-12-21 09:33:59 +00:00
Yuntao Xu
af4f0b64ed Merge "Support LOCAL_CHECK_ELF_FILES in androidmk tool" am: 38a5faf639 am: 93127aea3e am: 652ba3ad1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1926780

Change-Id: Ia7bbe38a1cd32fc11309fea59597b320a9d8f857
2021-12-21 09:33:47 +00:00
Treehugger Robot
beb984e0cd Merge "Pass --write-reference-baseline to lint" am: 430059b422 am: dd0667e31d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1822276

Change-Id: I455c581e12063f406e257ff9e7307a5509648b2e
2021-12-21 09:13:09 +00:00
Yuntao Xu
652ba3ad1c Merge "Support LOCAL_CHECK_ELF_FILES in androidmk tool" am: 38a5faf639 am: 93127aea3e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1926780

Change-Id: I871433573cae1603b44caa3d6d7ff9929fd438fb
2021-12-21 09:12:59 +00:00
Treehugger Robot
dd0667e31d Merge "Pass --write-reference-baseline to lint" am: 430059b422
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1822276

Change-Id: I73520e7b47986c939480262fad0ad5b105093b22
2021-12-21 08:50:51 +00:00
Yuntao Xu
93127aea3e Merge "Support LOCAL_CHECK_ELF_FILES in androidmk tool" am: 38a5faf639
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1926780

Change-Id: I7a692e1d040a85275f0eee3dca4a402fea51f3aa
2021-12-21 08:50:40 +00:00
Treehugger Robot
430059b422 Merge "Pass --write-reference-baseline to lint" 2021-12-21 08:36:34 +00:00
Sorin Basca
0fc8b49bbc Merge "Adding option to include sources only for Java 11 builds" am: 55f84a74c5 am: d0ade7a7f8 am: c9b9540233 am: cae602eee3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927441

Change-Id: Ie422105450f6a65d08aaca9c1347b914481b0669
2021-12-21 08:36:01 +00:00
Yuntao Xu
38a5faf639 Merge "Support LOCAL_CHECK_ELF_FILES in androidmk tool" 2021-12-21 08:30:24 +00:00
Sorin Basca
cae602eee3 Merge "Adding option to include sources only for Java 11 builds" am: 55f84a74c5 am: d0ade7a7f8 am: c9b9540233
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927441

Change-Id: I0bbe60a35917f8945bf0a8f5b794293b44cd2c5b
2021-12-21 08:18:45 +00:00
Sorin Basca
c9b9540233 Merge "Adding option to include sources only for Java 11 builds" am: 55f84a74c5 am: d0ade7a7f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927441

Change-Id: I41474f08cd5d44b6e827531a46027e784e0251c3
2021-12-21 08:07:14 +00:00
Sorin Basca
d0ade7a7f8 Merge "Adding option to include sources only for Java 11 builds" am: 55f84a74c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927441

Change-Id: Ib8c7fe813e635e5c973b6ac56117b5bc6168804f
2021-12-21 07:55:33 +00:00
Inseob Kim
2dcfd20d89 Merge "Add sepolicy prebuilt directories to soong_config" am: 1778546f7a am: 0245bbe0e1 am: 938f382579 am: d128b2d644
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1925909

Change-Id: I5f15b9528fe2da25241a1ec16afd65bbbda1de4b
2021-12-21 07:54:39 +00:00
Inseob Kim
d128b2d644 Merge "Add sepolicy prebuilt directories to soong_config" am: 1778546f7a am: 0245bbe0e1 am: 938f382579
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1925909

Change-Id: Id1ec535922b9041a6892a6f1e6c237c26563efa7
2021-12-21 07:39:44 +00:00
Sorin Basca
55f84a74c5 Merge "Adding option to include sources only for Java 11 builds" 2021-12-21 07:37:46 +00:00
Inseob Kim
938f382579 Merge "Add sepolicy prebuilt directories to soong_config" am: 1778546f7a am: 0245bbe0e1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1925909

Change-Id: I22dd97ff4f46bf91799169af7938e60d0231dc99
2021-12-21 07:23:39 +00:00
Inseob Kim
0245bbe0e1 Merge "Add sepolicy prebuilt directories to soong_config" am: 1778546f7a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1925909

Change-Id: Ib2734218555b9e7988f63b8e4f48aa0db9d8d1a9
2021-12-21 07:20:18 +00:00
Inseob Kim
1778546f7a Merge "Add sepolicy prebuilt directories to soong_config" 2021-12-21 07:09:58 +00:00
Matthew Maurer
fd2b90513d Merge "rust: Disable dylib vendor modules" am: 2e2ec0573f am: 121d19b571 am: b218272e71 am: 97eae19cf0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927628

Change-Id: I1b630fdce952050bd0df51016bdcd04f9f663fd2
2021-12-20 22:51:04 +00:00
Matthew Maurer
97eae19cf0 Merge "rust: Disable dylib vendor modules" am: 2e2ec0573f am: 121d19b571 am: b218272e71
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927628

Change-Id: Ifcf27fc762f0b665c24cc2435e3a14bfc97d3a12
2021-12-20 22:37:08 +00:00
Matthew Maurer
b218272e71 Merge "rust: Disable dylib vendor modules" am: 2e2ec0573f am: 121d19b571
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927628

Change-Id: Ife6f6884f27b4d54e20bf43808621cd3f2b84624
2021-12-20 22:28:40 +00:00
Matthew Maurer
121d19b571 Merge "rust: Disable dylib vendor modules" am: 2e2ec0573f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927628

Change-Id: I6df62af8aad15e2b7794abb4235f4a99b9e332d1
2021-12-20 21:55:41 +00:00
Matthew Maurer
2e2ec0573f Merge "rust: Disable dylib vendor modules" 2021-12-20 21:40:56 +00:00
Jiakai Zhang
31d2c1f14c Merge changes I8f4eaed1,I358a62d3 am: 880e11112d am: 02d1c10b3a am: 58fe40abc1 am: 3a3250f40e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1928068

Change-Id: Ie325fa547912fd6618a50b463f40b7a1028047e1
2021-12-20 21:36:09 +00:00
Sorin Basca
9347ae3ba0 Adding option to include sources only for Java 11 builds
Bug: 207852002
Test: m
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_11=true m
Change-Id: I554a79798ea7f1dd4a96b09f761090f83a009cb4
2021-12-20 21:33:14 +00:00
Jiakai Zhang
3a3250f40e Merge changes I8f4eaed1,I358a62d3 am: 880e11112d am: 02d1c10b3a am: 58fe40abc1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1928068

Change-Id: I3b312ffc40a2499676fd8f5219017aa8f86d1911
2021-12-20 21:11:58 +00:00
Jiakai Zhang
58fe40abc1 Merge changes I8f4eaed1,I358a62d3 am: 880e11112d am: 02d1c10b3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1928068

Change-Id: I94fddc6c37d09358e6a759f569ed0c44e124d272
2021-12-20 20:31:32 +00:00
Jiakai Zhang
02d1c10b3a Merge changes I8f4eaed1,I358a62d3 am: 880e11112d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1928068

Change-Id: Ic7593b09191ebc48fbe89bd46662a769a61b170d
2021-12-20 20:15:09 +00:00
Jiakai Zhang
880e11112d Merge changes I8f4eaed1,I358a62d3
* changes:
  Dexpreopt standalone system server jars from prebuilts.
  Dexpreopt standalone system server jars.
2021-12-20 19:52:37 +00:00
Jiakai Zhang
28bc9a8a7e Dexpreopt standalone system server jars from prebuilts.
This change adds support for dexpreopting standalone system server
jars from prebuilts.

Bug: 203198541
Test: -
  1. Add a standalone system server jar (e.g., by patching
     aosp/1906158)
  2. Build and drop a module SDK and an APEX.
  3. Build a system image from prebuilts.
  4. See the odex and vdex files generated in
     $ANDROID_PRODUCT_OUT/system/framework/oat/
Change-Id: I8f4eaed10a1053cd560b8583efa12dc495f58db1
2021-12-20 15:48:20 +00:00
Jiakai Zhang
389a647320 Dexpreopt standalone system server jars.
Standalone system server jars are dynamically loaded by system server
using a `PathClassLoader` whose parent is `SYSTEMSERVERCLASSPATH`. They
are listed in `PRODUCT_STANDALONE_SYSTEM_SERVER_JARS` and
`PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS` in Makefile. We need to
dexpreopt them to achieve better performance.

Bug: 203198541
Test: m nothing
Test: -
  1. Add a standalone system server jar (e.g., by patching
     aosp/1906158)
  2. Build a system image.
  3. See the odex and vdex files generated in
     $ANDROID_PRODUCT_OUT/system/framework/oat/
  4. Flash the image to a device.
  5. Run `atest art_standalone_dexpreopt_tests`.
Change-Id: I358a62d34989c5c8eba12e18fe6167e0b72ff69d
2021-12-20 15:07:26 +00:00
Treehugger Robot
dbd3553d83 Merge "Remove InstallBypassMake and ToMakePath" am: f1228f570a am: a9f335cf5a am: fd865c6688 am: 8ef2179a6e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889722

Change-Id: If49c894804c5ca0dfd197ca848ff1c9ac79556f4
2021-12-17 07:36:53 +00:00
Treehugger Robot
8ef2179a6e Merge "Remove InstallBypassMake and ToMakePath" am: f1228f570a am: a9f335cf5a am: fd865c6688
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889722

Change-Id: I03ff465d17fb4625b8b5e7dc535c5791e87d204d
2021-12-17 07:19:06 +00:00
Treehugger Robot
fd865c6688 Merge "Remove InstallBypassMake and ToMakePath" am: f1228f570a am: a9f335cf5a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889722

Change-Id: I86d6fc4ff9f7209ea1a0b4553b2239b3de2f04b0
2021-12-17 06:55:52 +00:00
Treehugger Robot
a9f335cf5a Merge "Remove InstallBypassMake and ToMakePath" am: f1228f570a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889722

Change-Id: I9ef6388601d75d8d1676d48638ccac3aac7e4971
2021-12-17 06:32:16 +00:00
Treehugger Robot
f1228f570a Merge "Remove InstallBypassMake and ToMakePath" 2021-12-17 06:15:16 +00:00
Yi Kong
126fc68a92 Merge "Turn on -Wstring-concatenation" am: 53fc7705ec am: 28a933cf8c am: 0b7fccbb5f am: 64c00f2209
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1922284

Change-Id: I5e7038f84ac6da2144ce097095066557514b5145
2021-12-17 05:36:55 +00:00
Yi Kong
64c00f2209 Merge "Turn on -Wstring-concatenation" am: 53fc7705ec am: 28a933cf8c am: 0b7fccbb5f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1922284

Change-Id: If86e26e5bae98086deb8e2bc43a111c764ab4a1b
2021-12-17 05:20:05 +00:00