Commit Graph

46045 Commits

Author SHA1 Message Date
Paul Duffin
2a27960bd6 Merge changes I88ee9709,If2ea3fde,I657fbcde,I585a8861 am: e8412c4e7a am: fed3551805
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1873694

Change-Id: If7edc3a99f09c61806f1e010f88aa06f18e004f6
2021-10-29 20:12:45 +00:00
Paul Duffin
fed3551805 Merge changes I88ee9709,If2ea3fde,I657fbcde,I585a8861 am: e8412c4e7a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1873694

Change-Id: Ib2b791e2fe8b8685f28c07f0ecd09cdd9a2fba1e
2021-10-29 19:55:58 +00:00
Paul Duffin
e8412c4e7a Merge changes I88ee9709,If2ea3fde,I657fbcde,I585a8861
* changes:
  Use toModule for all "standard" API surfaces
  Run TestClasspath test cases with Always_use_prebuilt_sdks=true/false
  Refactor TestClasspath to simplify follow up change
  Add tests for prebuilts of all API surfaces
2021-10-29 19:41:33 +00:00
Colin Cross
b6289005da Merge "Revert "Make installable arch-variant for cc modules"" am: 972e7ba893 am: c6dd42f2ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875314

Change-Id: I3cbd2651039034ad699e014aa8a8c9949651f493
2021-10-29 18:43:13 +00:00
Jiakai Zhang
c5ae770e62 Merge "Add a build-time check for dexpreopting system server jars." am: 65947f6fc4 am: 4e5ffa8d5c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1840058

Change-Id: I21d31cd549ed63a70de4c3e634b1c8b25371bfb0
2021-10-29 18:43:00 +00:00
Colin Cross
c6dd42f2ae Merge "Revert "Make installable arch-variant for cc modules"" am: 972e7ba893
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875314

Change-Id: I2ac1120f1a596759e7cf85f4580caa62b7191cba
2021-10-29 18:18:42 +00:00
Jiakai Zhang
4e5ffa8d5c Merge "Add a build-time check for dexpreopting system server jars." am: 65947f6fc4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1840058

Change-Id: Ie4a934d49ede52be2a74724061d8f1af1534847d
2021-10-29 18:18:18 +00:00
Colin Cross
972e7ba893 Merge "Revert "Make installable arch-variant for cc modules"" 2021-10-29 18:10:59 +00:00
Colin Cross
545104bea1 Revert "Make installable arch-variant for cc modules"
Revert submission 1874144-native_bridge_libc_dup_rules

Reason for revert: breaks ndk_translation_all build
Reverted Changes:
I5379aa959:Make native bridge libc uninstallable
I2220d6b48:Remove BUILD_BROKEN_DUP_RULES from cuttlefish buil...
I8e0eaed21:Make installable arch-variant for cc modules

Bug: 204136549
Fixes: 204572444
Change-Id: I089a13675123a33a3ec3fea8eaa40c65fb2e5e59
2021-10-29 18:08:36 +00:00
Jiakai Zhang
65947f6fc4 Merge "Add a build-time check for dexpreopting system server jars." 2021-10-29 18:00:51 +00:00
Paul Duffin
e9758b0415 Use toModule for all "standard" API surfaces
For the purposes of this change a standard API surface is one of the
following:
* public
* system
* test
* module-lib
* system-server

Test: m droid
Bug: 204189791
Change-Id: I88ee9709430ca455dd6c7d1523ae22f8c22b0b7e
2021-10-29 17:57:12 +01:00
Paul Duffin
132c3e61c0 Run TestClasspath test cases with Always_use_prebuilt_sdks=true/false
Previously, the TestClasspath test cases were only run with the default
setting of Always_use_prebuilt_sdks=false. That meant that some of the
code under test that depended on the setting of that variable was not
tested properly.

This change runs the test cases m with Always_use_prebuilt_sdks=true as
well. Those test cases whose behavior depends on the setting of that
variable are split into two separate test cases, each of which only
runs with the appropriate setting of that variable. All other test
cases are run for both settings of the variable.

That revealed a slight issue with the test setup (a missing
prebuilts/sdk/public/core/android.jar file) which broke the
core_current test when run with Always_use_prebuilt_sdks=true which has
also been fixed.

Bug: 204189791
Test: m nothing
Change-Id: If2ea3fde40c7573262e93691af0b5a57e4d54469
2021-10-29 17:57:12 +01:00
Paul Duffin
0b3b36a402 Refactor TestClasspath to simplify follow up change
Extracts classpathTestCase and extracts the logic for creating the test
into a separate testClasspathTestCases func.

Bug: 204189791
Test: m nothing
Change-Id: I657fbcde23a18f7f5651c174fbf17a9b7b7f1a9a
2021-10-29 17:57:12 +01:00
Paul Duffin
12e311d958 Add tests for prebuilts of all API surfaces
Previously, the tests only covered checking the sdk dependencies added
when using a prebuilt current (public) and system SDKs, i.e. with
sdk_version set to "current_30" or "system_30". This change adds tests
to cover other APIs, e.g. "test_30", "module_30" and
"system_server_30". It adds tests for "module" and "system-server" up
to API level 32 as following changes will give them different behavior
as API levels less than or equal to 31 do not have a separate
core-for-system-modules.jar file for the module-lib API.

Bug: 204189791
Test: m nothing
Change-Id: I585a88615439a24abf75250114a86113b5f5da57
2021-10-29 17:57:12 +01:00
Colin Cross
1dc06ad960 Merge "Make installable arch-variant for cc modules" am: f87065fedb am: 10f31785fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874481

Change-Id: I610bfc478e69d9cbd19e59559699858048477b2d
2021-10-29 15:36:46 +00:00
Colin Cross
10f31785fa Merge "Make installable arch-variant for cc modules" am: f87065fedb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874481

Change-Id: I7bd7b0e4ed20604af1b104dbd748b5b19e2e7758
2021-10-29 15:19:04 +00:00
Colin Cross
f87065fedb Merge "Make installable arch-variant for cc modules" 2021-10-29 14:58:03 +00:00
Treehugger Robot
5cd602678b Merge "Remove MainNinjaFile()" am: 3bf5986bb3 am: 0dcc020ae4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874417

Change-Id: If10f5ef7b30e8288fbf60c7a910c0233ef16d319
2021-10-29 13:49:51 +00:00
Treehugger Robot
0dcc020ae4 Merge "Remove MainNinjaFile()" am: 3bf5986bb3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874417

Change-Id: I00ca2e67995e5da1486165b897a46089314f3873
2021-10-29 13:26:31 +00:00
Treehugger Robot
3bf5986bb3 Merge "Remove MainNinjaFile()" 2021-10-29 13:12:00 +00:00
Jiakai Zhang
0a0a2fbea9 Add a build-time check for dexpreopting system server jars.
This change adds a Soong module that stores the paths to the compilation
artifacts of system server jars in a variable, which will then be
consumed by Make to check if the artifacts are installed. When the check
fails, it means that dexpreopting is not working for some system server
jars and needs to be fixed.

Bug: 201371822
Test: m nothing
Test: manual -
  1. Add "service-permission" to DEXPREOPT_DISABLED_MODULES (https://cs.android.com/android/platform/superproject/+/master:build/make/core/product_config.mk?q=DEXPREOPT_DISABLED_MODULES)
  2. m nothing
  3. See the error:
    Missing compilation artifacts. Dexpreopting is not working for some system server jars
    Offending entries:
    system/framework/oat/x86_64/apex@com.android.permission@javalib@service-permission.jar@classes.odex
    system/framework/oat/x86_64/apex@com.android.permission@javalib@service-permission.jar@classes.vdex
Change-Id: I4816f19668f1dae180a34adafdbfa448c97aa0db
2021-10-29 11:55:20 +00:00
Mohammad Islam
53c61eed3a Merge "Make car apex's library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS" am: c874504988 am: e6de0ed5b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1871662

Change-Id: I4606ebde1889d09734627e34a9e5d96750523363
2021-10-29 10:15:52 +00:00
Mohammad Islam
e6de0ed5b8 Merge "Make car apex's library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS" am: c874504988
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1871662

Change-Id: I323170bd1a82c0ebc6d2a189c836e880f4339abd
2021-10-29 09:57:54 +00:00
Mohammad Islam
c874504988 Merge "Make car apex's library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS" 2021-10-29 09:40:49 +00:00
Cole Faust
65f298ca63 Remove MainNinjaFile()
It was the same as SoongNinjaFile, except it used
shared.JoinPath instead of filepath.Join, which
doesn't matter here because the second argument
is never an absolute path.

Test: Presubmits
Change-Id: I95e64a8b8971bd168a1dc6670ae80f4d336045b5
2021-10-28 16:05:13 -07:00
Treehugger Robot
5bb9910ea6 Merge "Make a pass over our codebase cleaning up non-precise / non-inclusive language." am: c9e85ca825 am: e68637799b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1871701

Change-Id: I06866aa4143a23fea360ff4ff34b6164adac4174
2021-10-28 21:24:37 +00:00
Treehugger Robot
e68637799b Merge "Make a pass over our codebase cleaning up non-precise / non-inclusive language." am: c9e85ca825
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1871701

Change-Id: I8649a96869b3c28f089feef84464195fe354a2da
2021-10-28 21:06:30 +00:00
Treehugger Robot
c9e85ca825 Merge "Make a pass over our codebase cleaning up non-precise / non-inclusive language." 2021-10-28 20:51:17 +00:00
Treehugger Robot
abc098722a Merge changes from topics "is_board_platform", "soong_config_namespace" am: d0fb23705f am: 0be9038df8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1810817

Change-Id: Ia9ea1967319ebd46b6a3414ddadd7c3b5dbfbd49
2021-10-28 20:30:45 +00:00
Sasha Smundak
10830a05de Fix how the rule is displayed in the error message. am: 2afb9d7722 am: 58c231b69e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1868384

Change-Id: Idb6d5b7272707dda515af352505b8a72bf651873
2021-10-28 20:30:45 +00:00
Sasha Smundak
9069284053 Implement include path annotation. am: 6d852dd16a am: a9aacce883
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1846795

Change-Id: Icfed85edf3beb906cbd849a8135f9099f54a65b2
2021-10-28 20:30:44 +00:00
Sasha Smundak
b331431cfe Better Soong config namespace support. am: 65b547edc2 am: 250d27639f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831854

Change-Id: I5fbdc617ae88244a5289e7814d489e4437e1f5f7
2021-10-28 20:30:42 +00:00
Colin Cross
1e7cfdea4a Make installable arch-variant for cc modules
libc's native_bridge variant needs to be installable: false, make
the installable property arch-variant.

Bug: 204136549
Test: m checkbuild
Change-Id: I8e0eaed2169e89520b07bb0326bb97ac0b4a70ac
2021-10-28 13:26:45 -07:00
Treehugger Robot
0be9038df8 Merge changes from topics "is_board_platform", "soong_config_namespace" am: d0fb23705f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1810817

Change-Id: I03dfbb925ba084b1190b1407ee696cd51cf6dfe8
2021-10-28 20:13:02 +00:00
Sasha Smundak
58c231b69e Fix how the rule is displayed in the error message. am: 2afb9d7722
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1868384

Change-Id: I68e91a903606d7033a88fc353386378baf890757
2021-10-28 20:13:01 +00:00
Sasha Smundak
a9aacce883 Implement include path annotation. am: 6d852dd16a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1846795

Change-Id: I9e44941345e0cc0d18aa948abb0925c77fb3ff5a
2021-10-28 20:13:01 +00:00
Sasha Smundak
250d27639f Better Soong config namespace support. am: 65b547edc2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831854

Change-Id: If2307050153fe0070d94e60980721d7954de65a3
2021-10-28 20:13:00 +00:00
Treehugger Robot
d0fb23705f Merge changes from topics "is_board_platform", "soong_config_namespace"
* changes:
  Convert is-board-platform2/is-board-platform-in-list2/is-vendor-board-qcom macros.
  Fix how the rule is displayed in the error message.
  Implement include path annotation.
  Better Soong config namespace support.
2021-10-28 19:57:09 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
5d5754f774 cc_prebuilt_library_shared converted via bp2build am: 7fa0696eb7 am: 66ca6a87ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1871615

Change-Id: If641992b0ead562c3e3790fa3f085d831044f588
2021-10-28 19:06:36 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
66ca6a87ff cc_prebuilt_library_shared converted via bp2build am: 7fa0696eb7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1871615

Change-Id: I27d8f970d4f268536fa69b1c4bf8c58549777991
2021-10-28 18:42:35 +00:00
Joe Onorato
b4638c1ac3 Make a pass over our codebase cleaning up non-precise / non-inclusive language.
Test: treehugger
Bug: 204369779
Change-Id: I6e63cae824d323535cdb14b493edd868df47738d
2021-10-28 10:32:07 -07:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
7fa0696eb7 cc_prebuilt_library_shared converted via bp2build
Bug: b/203699063
Test: bp2build/cc_prebuilt_library_shared_test.go
Test: USE_BAZEL_ANALYSIS=1 m nothing
Test: mixed_{libc,droid}.sh
Change-Id: I4c58224e88c31507a4b285f8c55bdc066bd47232
2021-10-28 11:04:50 -04:00
Keun young Park
d64ab233e4 Make car apex's library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS
- car-frameworks-service-module is added from com.android.car.framework
  apex which only exisits in car products.

Bug: 203233647
Bug: 203201931
Test: build, bootup
Change-Id: I5f13b0505c1ac4fd2fd7b6559e080c8a6fb526e0
Merged-In: I5f13b0505c1ac4fd2fd7b6559e080c8a6fb526e0
(cherry picked from commit 6e3ba9ac3b)
2021-10-28 06:12:26 +01:00
Treehugger Robot
17b6e97c92 Merge "Add path of uwb NativeManager to rust allowlist." am: 2a524318e4 am: 5aa3b275de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1872014

Change-Id: I9517edb4dd0ceeb23723e8f9c77af5b7204ad3ba
2021-10-27 21:43:06 +00:00
Treehugger Robot
5aa3b275de Merge "Add path of uwb NativeManager to rust allowlist." am: 2a524318e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1872014

Change-Id: I7f5010604c677ade490d8384ad808c778108aed0
2021-10-27 21:23:09 +00:00
Chih-hung Hsieh
9e2cb93d0a Merge "Do not add .tidy files as RBE link inputs" am: 4dceb3705f am: 6e1b62d2b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869384

Change-Id: I7d20f228304b7f7fa5022fe77fd96a502d0b7936
2021-10-27 21:14:08 +00:00
Treehugger Robot
2a524318e4 Merge "Add path of uwb NativeManager to rust allowlist." 2021-10-27 21:03:22 +00:00
Chih-hung Hsieh
6e1b62d2b1 Merge "Do not add .tidy files as RBE link inputs" am: 4dceb3705f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869384

Change-Id: I7066ab503f04d304aec9ff6634b51a16fc3c478c
2021-10-27 20:55:00 +00:00
Chih-hung Hsieh
4dceb3705f Merge "Do not add .tidy files as RBE link inputs" 2021-10-27 20:29:04 +00:00
ziyiw
f3d0222262 Add path of uwb NativeManager to rust allowlist.
Test: mmm
Bug: 197341298
Change-Id: I70a40f493efced15702dcd0f9ab50733ea23df9f
2021-10-27 11:28:17 -07:00