StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,286 Commits 1 Branch 0 Tags
f80b698957c6dcb41aa5b218ccbfb50e975574a2
Commit Graph

20286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Stjernholm
f80b698957 Merge changes from topics "target-build-unbundled", "unbundled-preopt" am: fa096325fe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324491

Change-Id: I0964289e33d6f567eff69fc80a1f08ba24f77f68
 2020-06-11 10:26:08 +00:00
Martin Stjernholm
fa096325fe Merge changes from topics "target-build-unbundled", "unbundled-preopt" 
* changes:
  Don't disable dexpreopting implicitly in unbundled builds.
  Add TARGET_BUILD_UNBUNDLED as a variable to control builds.
 2020-06-11 10:01:59 +00:00
Treehugger Robot
4019a06c3c Merge "Update LLVM toolchain to r383902b." am: 9f42bb8822 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1329715

Change-Id: I865ed02fedfdbb6405647f187998edb9cc2b29b1
 2020-06-11 08:55:44 +00:00
Treehugger Robot
9f42bb8822 Merge "Update LLVM toolchain to r383902b." 2020-06-11 08:44:18 +00:00
Treehugger Robot
6c76f5789c Merge "Fix using generated test configs for sh_test, python_test and rust_test modules" am: f2d19b5f34 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1327350

Change-Id: I37626e25dc69f95156f2ef22397b2abb6b7b5023
 2020-06-11 08:24:58 +00:00
Treehugger Robot
f2d19b5f34 Merge "Fix using generated test configs for sh_test, python_test and rust_test modules" 2020-06-11 08:11:16 +00:00
Colin Cross
a6384821f9 Fix using generated test configs for sh_test, python_test and rust_test modules 
Annotate the test config properties with android:"path", and always
use LOCAL_FULL_TEST_CONFIG to pass the path to Make.

Bug: 157621988
Test: manual
Change-Id: I1c020e642f83d994d63c9e9cb56e686086d5acaa
 2020-06-10 22:48:16 -07:00
Treehugger Robot
6f77147fde Merge "Add exclude_shared_libs, expand exclude_static_libs to cover static_libs" am: 7d95aac066 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1330296

Change-Id: I5955ebb58f5db41aa6127aefd493430998a749c2
 2020-06-11 03:01:11 +00:00
Treehugger Robot
7d95aac066 Merge "Add exclude_shared_libs, expand exclude_static_libs to cover static_libs" 2020-06-11 02:38:31 +00:00
Treehugger Robot
86e4acfaad Merge "Fix type assertion error regarding dex_import" am: 36aef533cc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1328734

Change-Id: I3ec183749d7edae0f4da831fb7a4dcc1354648c6
 2020-06-11 00:59:19 +00:00
Treehugger Robot
36aef533cc Merge "Fix type assertion error regarding dex_import" 2020-06-11 00:45:46 +00:00
Colin Cross
062103115c Add exclude_shared_libs, expand exclude_static_libs to cover static_libs 
Allow variants to exclude shared or static libs.

Bug: 153609531
Test: manual
Change-Id: I6ac9c445ed233c774a051743ed6760058c9918e9
 2020-06-10 15:47:34 -07:00
Stephen Hines
b31d77e57c Update LLVM toolchain to r383902b. 
Bug: http://b/149417653
Test: m
Change-Id: I0e191b463852da8b5eb5a4e092ef9b5da255df3d
 2020-06-10 15:39:31 -07:00
Martin Stjernholm
4a644cf9e5 Merge "Fix duplicate install targets from sdk variants in --skip-make mode." am: d297b77e84 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322698

Change-Id: I7e02972d34498ce7cf83376c0976aae02770833e
 2020-06-10 18:26:05 +00:00
Martin Stjernholm
d297b77e84 Merge "Fix duplicate install targets from sdk variants in --skip-make mode." 2020-06-10 18:25:44 +00:00
Elliott Hughes
274a80c492 Merge "Remove TARGET_PREFER_32_BIT support." am: a82ad479a4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1289612

Change-Id: I70fbe62a9da538ba484e78c5d9ea4ddbbe416737
 2020-06-10 18:25:42 +00:00
Elliott Hughes
a82ad479a4 Merge "Remove TARGET_PREFER_32_BIT support." 2020-06-10 18:07:06 +00:00
Jiyong Park
9e83f0b531 Fix type assertion error regarding dex_import 
Ida6f7bb784efe74cc1fa0e8d370eaee803f08b0f made it possible to add
dex_import modules into apex, but that change had a bug. When creating
Android.mk for the dex_import module, the code executed an unchecked
type assertion to convert java.DexImport to java.Dependency, which
cannot be successful. This change fixes the bug by doing a checked type
assertion instead.

Bug: 157886942
Test: m (test added)
Change-Id: Id22c20d42effce539fab10b0d349bf340d467f02
 2020-06-11 00:35:03 +09:00
Jiyong Park
ebccc4ddf5 Merge "dex_import that isn't available for platform isn't installed" am: d4873a6b68 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1325676

Change-Id: I1c70a39543d6edfef383464ae70e2d19518179b2
 2020-06-09 23:21:45 +00:00
Jiyong Park
d4873a6b68 Merge "dex_import that isn't available for platform isn't installed" 2020-06-09 23:02:10 +00:00
Victor Khimenko
b9b5662e3f Merge "Make it possible to specify separate rules for native_bridge case" am: bf488e10e8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1306133

Change-Id: I0657cc1bf2bea1165ff1615ab1db34aa6a9d83b6
 2020-06-09 17:52:37 +00:00
Victor Khimenko
bf488e10e8 Merge "Make it possible to specify separate rules for native_bridge case" 2020-06-09 17:41:28 +00:00
Ivan Lozano
1d329be624 Merge "Specify SONAME when building Rust shared libs." am: 4231e344fa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326238

Change-Id: If4ad90a3e9fa781fe4daad3618a9d338b0aaf522
 2020-06-09 16:00:27 +00:00
Ivan Lozano
4231e344fa Merge "Specify SONAME when building Rust shared libs." 2020-06-09 15:49:34 +00:00
Pete Gillin
5dbf9e09f2 Merge "Split the core/platform API into stable and legacy versions." am: d7db79cc8b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322704

Change-Id: I93e8a2a91f9a5bed9d3274ad937bb351edf4aa88
 2020-06-09 13:28:54 +00:00
Pete Gillin
d7db79cc8b Merge "Split the core/platform API into stable and legacy versions." 2020-06-09 13:20:31 +00:00
Ivan Lozano
bec05ea26d Specify SONAME when building Rust shared libs. 
Without specifying -soname, cc binaries are unable to locate Rust
provided shared libraries. This adds the -soname linker flag for shared
libraries.

Bug: 158490355
Test: readelf -d <cc_binary> shows the expected SONAME
Change-Id: I66852a7ce24d5ea5e426f11bc1834fb56a150628
 2020-06-09 08:40:24 -04:00
Ramy Medhat
9ec9b60463 Merge "Turn on metalava sandbox warning in all droiddoc metalava invocations." am: 4e372f7841 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323176

Change-Id: I9549d3f9d482ea6b497fb5bb7d1cb0dcc878d46a
 2020-06-09 12:32:17 +00:00
Ramy Medhat
4e372f7841 Merge "Turn on metalava sandbox warning in all droiddoc metalava invocations." 2020-06-09 12:17:38 +00:00
Victor Khimenko
c26fcf4947 Make it possible to specify separate rules for native_bridge case 
This change make it possible to specify separate rules for native-bridge
case and non-native-bridge case.

Bug: http://b/153609531

Test: build 4arch product

Change-Id: I60145bbb9c94318f14af3cabd9f5960fc9ee62de
 2020-06-09 13:31:37 +02:00
Treehugger Robot
15a013b87a Merge "Revert^2: "Remove implict jni.h include path"" am: 8b1531e7df 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326314

Change-Id: I45068a8fb9985d23da62da90b7d4304d71448664
 2020-06-09 10:11:38 +00:00
Treehugger Robot
8b1531e7df Merge "Revert^2: "Remove implict jni.h include path"" 2020-06-09 09:55:13 +00:00
Orion Hodson
5cffce1207 Revert^2: "Remove implict jni.h include path" 
Bug: 152482542
Test: m checkbuild

Change-Id: I6175d7c59734ba9b6c32457e5a9b0704d49f4106
Merged-In: I6175d7c59734ba9b6c32457e5a9b0704d49f4106
Exempt-From-Owner-Approval: approved in other branches
(cherry picked from commit e3ce0ba781)
 2020-06-09 09:54:56 +00:00
Elliott Hughes
79ae341d4b Remove TARGET_PREFER_32_BIT support. 
Bug: https://issuetracker.google.com/138812821
Test: builds
Change-Id: If96cccbd82ba1311165d61c947c928c6e7cd5593
 2020-06-08 16:37:13 -07:00
Frank Feng
58894c86dc Merge "Implement test config auto-gen for sh_test." am: d90c6c42e4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323393

Change-Id: I666da5a4a5e09fb9deb14a8d4dad6be76583ed34
 2020-06-08 21:17:04 +00:00
Frank Feng
d90c6c42e4 Merge "Implement test config auto-gen for sh_test." 2020-06-08 21:05:31 +00:00
Jiyong Park
01bca755ae dex_import that isn't available for platform isn't installed 
This change fixes a bug that dex_import module is always installed to
the platform even when the module is not available to the platform.

Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 158284983
Test: OUT_DIR=/tmp/ndk build/soong/scripts/build-ndk-prebuilts.sh
Merged-In: I85570506e700be59ee63e4f1d7902a40e36df39c
(cherry picked from commit afd3d11a79)
Change-Id: I85570506e700be59ee63e4f1d7902a40e36df39c
 2020-06-08 21:53:52 +09:00
Pete Gillin
1f41dbff64 Split the core/platform API into stable and legacy versions. 
For now, everything outside libcore still uses the legacy version.

Test: treehugger
Bug: 157640067
Change-Id: If5234e9ee533ff537926801a0af045d36b1caf01
 2020-06-08 10:53:51 +01:00
Treehugger Robot
d8b3df07ce Merge "Use sdkSpec to compare sdk_versions of APK/JNI" am: 8a624337b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322146

Change-Id: Ieffbf61a1fb792e410e78c261662c80e15c2a05d
 2020-06-08 07:42:55 +00:00
Treehugger Robot
8a624337b3 Merge "Use sdkSpec to compare sdk_versions of APK/JNI" 2020-06-08 07:27:26 +00:00
Jooyung Han
652d5b31ef Use sdkSpec to compare sdk_versions of APK/JNI 
"current" is converted to int differently if we use
sdkSpec.effectiveVersion for APK and android.ApiStrToNum for JNI.
For example, in REL branch, "current" is equiv to PlatformSdkVersion
for APK, but 10000(FutureApiVersion) for JNI.

Use sdkSpec.effectiveVersion to compare APK.min_sdk_version and
JNI.sdk_version.

Exempt-From-Owner-Approval: cherrypick from internal

Bug: 145796956
Test: m
Merged-In: I2c4dbb79ae8712004dc3a9e647aa53cd5de7b508
Change-Id: I2c4dbb79ae8712004dc3a9e647aa53cd5de7b508
(cherry picked from commit 9d2c0f7af2)
 2020-06-08 07:19:56 +00:00
Inseob Kim
ab24ae3b5b Merge changes I059e639b,I4ebe1da8,Idf4fd37a,Id90082b5 am: 37ed5063e2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324103

Change-Id: I616bc3532a3450327ccdd4e61ba95ad4ed53d80a
 2020-06-08 03:46:12 +00:00
Inseob Kim
b56865ee60 Create only one vendor variant depending on path am: 85708802d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324102

Change-Id: I5526061c26e2949b8894eafa5df85014de0a229d
 2020-06-08 03:46:10 +00:00
Inseob Kim
d05c43a1ff Implement cc_object vendor snapshot am: 1042d29705 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324101

Change-Id: Id4d0d381b9c06eb6f012411e9184d4b993852568
 2020-06-08 03:46:08 +00:00
Inseob Kim
8aa5b39019 Refine logic choosing vendor snapshot modules am: 7f283f4bd0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324100

Change-Id: Ic2926232e9ffff86146f2bdde8f589752eb01876
 2020-06-08 03:46:06 +00:00
Inseob Kim
37ed5063e2 Merge changes I059e639b,I4ebe1da8,Idf4fd37a,Id90082b5 
* changes:
  Do not disable llndk libraries
  Create only one vendor variant depending on path
  Implement cc_object vendor snapshot
  Refine logic choosing vendor snapshot modules
 2020-06-08 03:34:24 +00:00
Treehugger Robot
4ba565ea17 Merge "Add eakammer and patricearruda to OWNERS" am: 575c610bba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324040

Change-Id: I6b3be9b0cdb1b6fe52765ec518cb7044fdfb4f91
 2020-06-05 23:43:38 +00:00
Treehugger Robot
575c610bba Merge "Add eakammer and patricearruda to OWNERS" 2020-06-05 23:30:31 +00:00
Alexander Smundak
29faa37442 Merge "Fix android_app_set documentation" am: 99e4fba932 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324841

Change-Id: I35634c8ed1290b5848fb4a5a8278b65fbcbf0106
 2020-06-05 22:46:03 +00:00
Alexander Smundak
99e4fba932 Merge "Fix android_app_set documentation" 2020-06-05 22:31:32 +00:00