StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,756 Commits 1 Branch 0 Tags
cc7a0a5a1c3e9e98e6293e7b372dce009e44e60d
Commit Graph

47756 Commits

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

Change-Id: I0028f8cd5ac1a702ccf9f0db8fb060fd3a8f12e2
 2021-10-29 20:48:09 +00:00
Paul Duffin
8daad8f988 Merge changes I88ee9709,If2ea3fde,I657fbcde,I585a8861 am: e8412c4e7a am: fed3551805 am: 2a27960bd6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1873694

Change-Id: I4b4bb783d5226a309fcdd9e2d2dc4a0c782b423f
 2021-10-29 20:30:29 +00:00
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
7b570f08c9 Merge "Revert "Make installable arch-variant for cc modules"" am: 972e7ba893 am: c6dd42f2ae am: b6289005da am: 9978e476d1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875314

Change-Id: I87ab1390c13c22f9628beaad7b3abb517fc451ae
 2021-10-29 19:16:49 +00:00
Jiakai Zhang
544d9fe9ef Merge "Add a build-time check for dexpreopting system server jars." am: 65947f6fc4 am: 4e5ffa8d5c am: c5ae770e62 am: ab317cfdc7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1840058

Change-Id: I8187af13640b29fb53831e7f5c7494096ecb7a67
 2021-10-29 19:16:32 +00:00
Colin Cross
9978e476d1 Merge "Revert "Make installable arch-variant for cc modules"" am: 972e7ba893 am: c6dd42f2ae am: b6289005da 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875314

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

Change-Id: I2e3611aa377d3dfcef5922856e56d8d4eea1b6a3
 2021-10-29 19:01:12 +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
dffeb5dd25 Merge "Make installable arch-variant for cc modules" am: f87065fedb am: 10f31785fa am: 1dc06ad960 am: 77450557b7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874481

Change-Id: Ieb3abbf12825df1129b62603dab96dbc5935c618
 2021-10-29 16:10:56 +00:00
Colin Cross
77450557b7 Merge "Make installable arch-variant for cc modules" am: f87065fedb am: 10f31785fa am: 1dc06ad960 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874481

Change-Id: If000e2cab00d54312ff31f3b8c8dc67f736a2d3c
 2021-10-29 15:54:56 +00: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
0a2be08f63 Merge "Remove MainNinjaFile()" am: 3bf5986bb3 am: 0dcc020ae4 am: 5cd602678b am: a4348b4928 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874417

Change-Id: I40bdaaad46eefe7bd7190bd4a04d1232cea41cf3
 2021-10-29 14:29:31 +00:00
Treehugger Robot
a4348b4928 Merge "Remove MainNinjaFile()" am: 3bf5986bb3 am: 0dcc020ae4 am: 5cd602678b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874417

Change-Id: I3a867a753be40c066581ef3003090688d67221e4
 2021-10-29 14:12:08 +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
60121ae4d7 Merge "Make car apex's library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS" am: c874504988 am: e6de0ed5b8 am: 53c61eed3a am: 144aeda4b4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1871662

Change-Id: I3deda0c610495c71ea4022224f3d0a77567540e6
 2021-10-29 10:42:43 +00:00
Mohammad Islam
144aeda4b4 Merge "Make car apex's library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS" am: c874504988 am: e6de0ed5b8 am: 53c61eed3a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1871662

Change-Id: I81002ecd4cc03f0f5604b46de064ead934a1b53a
 2021-10-29 10:33:14 +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
3be5075c71 Merge "Make a pass over our codebase cleaning up non-precise / non-inclusive language." am: c9e85ca825 am: e68637799b am: 5bb9910ea6 am: df50b4ba4b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1871701

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

Change-Id: If6d953621ef52e3c83924ca761213c83f89b4e03
 2021-10-28 21:42:06 +00: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
37d552034a Merge changes from topics "is_board_platform", "soong_config_namespace" am: d0fb23705f am: 0be9038df8 am: abc098722a am: 585ae807f6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1810817

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

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

Change-Id: I78c4189d866998939139bfa1eb2238e5966dd60f
 2021-10-28 20:58:16 +00:00
Sasha Smundak
76d5b07e82 Better Soong config namespace support. am: 65b547edc2 am: 250d27639f am: b331431cfe am: 774f4711e2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831854

Change-Id: Icf80f56982b50e5c750ac5e4c7739a663f162fa7
 2021-10-28 20:58:13 +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
585ae807f6 Merge changes from topics "is_board_platform", "soong_config_namespace" am: d0fb23705f am: 0be9038df8 am: abc098722a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1810817

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

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

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

Change-Id: I2af63ca0a613d209a05c7dd386c7c3e0e42503a2
 2021-10-28 20:42:09 +00:00