StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,875 Commits 1 Branch 0 Tags
d3a2e1e36e35190a3161f4350940842a3adf899c
Commit Graph

17875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin
d3a2e1e36e Merge "Add basic test for java_system_modules" 
am: 0b3a5781a9

Change-Id: I9e8dfadedc65eca652b6085cb076c05e12beacb7
 2020-01-15 18:04:47 -08:00
Treehugger Robot
0b3a5781a9 Merge "Add basic test for java_system_modules" 2020-01-16 02:03:44 +00:00
TreeHugger Robot
1c9f0439ae Merge "DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master 2020-01-16 01:43:52 +00:00
bralee
850a13f80c Merge "AIDEGen:fix module_bp_cc_deps.json content error." 
am: bb363086c7

Change-Id: Ie810ff61af584daf7c45f41ae595516e0abc60b8
 2020-01-15 17:09:06 -08:00
Treehugger Robot
bb363086c7 Merge "AIDEGen:fix module_bp_cc_deps.json content error." 2020-01-16 00:20:40 +00:00
Xin Li
f04a1dcf8f DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master 
Bug: 146167222
Change-Id: Ie5441f31325b0b3156ea731d24f3036d5037aea8
 2020-01-15 15:59:08 -08:00
Jaewoong Jung
fc81db1149 Merge "Keep signatures of presigned prebuilt test apps." 
am: 275eb69d0a

Change-Id: Ibbb1d228e3747fb3f558619b252be42a2a39b03d
 2020-01-15 15:19:54 -08:00
Jaewoong Jung
275eb69d0a Merge "Keep signatures of presigned prebuilt test apps." 2020-01-15 23:17:02 +00:00
Matthew Maurer
046fda828c Merge changes I828b3e6b,I5d85ea8b 
am: 5f5809a098

Change-Id: I9404095b752929514297e8a6f31666e4055ada2d
 2020-01-15 12:30:59 -08:00
Matthew Maurer
5f5809a098 Merge changes I828b3e6b,I5d85ea8b 
* changes:
  rust: Do not pass -C prefer-dynamic for cdylib
  rust: Include Soong module name as metadata
 2020-01-15 20:28:25 +00:00
Dan Willemsen
7e3950624e Merge "Disallow system m4" 
am: 0b031cf181

Change-Id: I7f4a795ed3bb65de5aea7e9e4b6f6f56be29c691
 2020-01-15 11:41:12 -08:00
Treehugger Robot
0b031cf181 Merge "Disallow system m4" 2020-01-15 19:38:22 +00:00
Matthew Maurer
46c46ccafd rust: Do not pass -C prefer-dynamic for cdylib 
cdylib targets cannot currently dynamically link to Rust crates, so this
flag was not actually doing anything, and in conjunction with -C lto
which we *do* want on for this target, causes a hard error on
rustc-1.40.0.

Bug: 147438124
Test: Build a rust_library module, this implicitly tries to build cdylib
Change-Id: I828b3e6bae7c58f4081db3e73009b443a382a296
 2020-01-15 08:37:46 -08:00
Matthew Maurer
22cef966e1 rust: Include Soong module name as metadata 
If we want to build a component which uses two versions of a crate in
the dependency graph (for example, libc in std and libc from
external/crates), Rust requires at least one of them have a metadata
field to differentiate them.

Since Soong module names should be distinct for a given target, they
should serve as metadata.

Bug: 147397356
Test: Build a rust library with "rlibs: ["liblibc"]" in the blueprint
Change-Id: I5d85ea8b3197972c09de301c9523efaff08adf81
 2020-01-15 08:37:42 -08:00
Jaewoong Jung
7c5bd835d0 Keep signatures of presigned prebuilt test apps. 
Skip the JNI uncompress step for presigned prebuilt test apps. They
don't need it, and they can invalidate the signature. Also, fix the
install partition of prebuilt test apps.

Fixes: 143472191
Test: app_test.go
Test: Converted CtsShimPrivUpgradePrebuilt to bp and checked the
final output apk signature.

Change-Id: Ied7d3576b5db4de40a9ca9e388336229d07212f5
 2020-01-15 14:33:32 +00:00
Paul Duffin
a7b9f42587 Add basic test for java_system_modules 
Bug: 142940300
Test: m nothing
Change-Id: I8855df0832f93e40d31e457191590458c274bb5c
 2020-01-15 11:17:57 +00:00
Jiyong Park
8d050e8e6e Merge "Reland^2 "m <apex_name>-deps-info prints the internal/external deps of the APEX"" 
am: 814bebb8ea

Change-Id: I20352a3728ea7417090e46e8bfa5a8d75dc3ce5c
 2020-01-14 22:14:19 -08:00
Treehugger Robot
814bebb8ea Merge "Reland^2 "m <apex_name>-deps-info prints the internal/external deps of the APEX"" 2020-01-15 06:12:45 +00:00
bralee
adba3c0a0a AIDEGen:fix module_bp_cc_deps.json content error. 
Bug: 147324044
Test: 1. export SOONG_COLLECT_CC_DEPS=1 SOONG_GEN_CMAKEFILES=1;m nothing
         module_bp_cc_deps.json will be generated.
	 In module_bp_cc_deps.json,
	 "libui": {
             ...
             "system_include_flags": {
                 "header_search_path": [
                     "system/core/include",
                     "system/media/audio/include",
                     "hardware/libhardware/include",
                     "hardware/libhardware_legacy/include",
                     "hardware/ril/include",
                     "frameworks/native/include",
                     "frameworks/native/opengl/include",
                     "frameworks/av/include",
                     "libnativehelper/include_jni"
                 ]
                 "system_search_path": [
                     "bionic/libc/include",
                     "bionic/libc/kernel/uapi",
                     "bionic/libc/kernel/uapi/asm-x86",
                     "bionic/libc/kernel/android/scsi",
                     "bionic/libc/kernel/android/uapi"
                 ]
             },
             ...
         },

Change-Id: Iabc638ca451f568b2a4c09327f8f3c220f6fc154
 2020-01-15 13:38:48 +08:00
Inseob Kim
ed000d7832 Merge "Allow sdk and core modules to use sysprop_library" 
am: a46c2b1994

Change-Id: I0901e86188677a28263483cd939ac49563efa7f1
 2020-01-14 17:01:19 -08:00
Inseob Kim
a46c2b1994 Merge "Allow sdk and core modules to use sysprop_library" 2020-01-15 00:32:00 +00:00
Anton Hansson
305b6a7e4e Merge "Make android_test_helper_app support apex_available" 
am: ee76fba905

Change-Id: I240799a87f24e02e59bbcce460fe3be46a64c092
 2020-01-14 05:01:23 -08:00
Anton Hansson
ee76fba905 Merge "Make android_test_helper_app support apex_available" 2020-01-14 12:59:17 +00:00
Jiyong Park
83dc74b770 Reland^2 "m <apex_name>-deps-info prints the internal/external deps of the APEX" 
This reverts commit 7cb4d378e7.

Test: m
Test: ALLOW_MISSING_DEPENDENCIES=true DIST_DIR=out/dist ./art/tools/dist_linux_bionic.sh -j80 com.android.art.host
(in the master-art-host branch)

Change-Id: I9beca73aafdf42f03bfa19cf1634b2641dac417b
 2020-01-14 18:40:56 +09:00
Jiyong Park
39ed342b9b Merge "Revert "Reland "m <apex_name>-deps-info prints the internal/external deps of the APEX"""" 
am: a7503367cf

Change-Id: I0d6fc06b1734edff88eb60345c4603c080460e87
 2020-01-14 01:09:23 -08:00
Jiyong Park
a7503367cf Merge "Revert "Reland "m <apex_name>-deps-info prints the internal/external deps of the APEX"""" 2020-01-14 08:58:17 +00:00
Jiyong Park
7cb4d378e7 Revert "Reland "m <apex_name>-deps-info prints the internal/external deps of the APEX""" 
This reverts commit 956305c61c.

Reason for revert: broke master-art-host branch
Exempt-From-Owner-Approval: reverting a bad change

Change-Id: Id7faed4ee85328c7c65847a3543ea9e67a3d50b3
 2020-01-14 08:58:02 +00:00
Inseob Kim
c52395135f Allow sdk and core modules to use sysprop_library 
This allows javaSdk and javaCore modules to link against Public stub of
Platform owned sysprop_library.

Bug: 141246285
Test: m nothing
Change-Id: Ie11c43cc72ddd0ee13e4163955775c13eb9dbe92
 2020-01-14 15:58:59 +09:00
Jiyong Park
acf9d43674 Merge "Reland "m <apex_name>-deps-info prints the internal/external deps of the APEX""" 
am: 17c51a4ff6

Change-Id: I0e87c8daffac11f3a867d148068110fa6658aec1
 2020-01-13 18:42:54 -08:00
Treehugger Robot
17c51a4ff6 Merge "Reland "m <apex_name>-deps-info prints the internal/external deps of the APEX""" 2020-01-14 02:40:42 +00:00
Jiyong Park
8870b634aa Merge "Prevent overridden APEX from being installed even when flattened" 
am: 0ed107d542

Change-Id: I1c2267c01c28d796596deccdff840b8e599e00c0
 2020-01-13 17:01:47 -08:00
Treehugger Robot
0ed107d542 Merge "Prevent overridden APEX from being installed even when flattened" 2020-01-14 00:57:31 +00:00
Lokesh Gidra
2fb8670829 Merge "Revert "use symlink for bundled APEX"" 
am: 47b461782b

Change-Id: I4d6787fe86ea70a9d36bdac9e158bb7f1cac2e5c
 2020-01-13 16:15:08 -08:00
Lokesh Gidra
47b461782b Merge "Revert "use symlink for bundled APEX"" 2020-01-14 00:08:15 +00:00
Lokesh Gidra
31c65d4fe4 Revert "use symlink for bundled APEX" 
This reverts commit 58ab941c6c.

Reason for revert: art-com_android_runtime_host-linux_bionic and art-linux-bionic-zipapex builds failing (https://android-build.googleplex.com/builds/submitted/6131062/art-com_android_runtime_host-linux_bionic/latest/view/logs/build.log)

Bug: 144533348
Change-Id: I040af6887aea205a5d72a416fc8e6533dcfa08dd
 2020-01-14 00:06:41 +00:00
Elliott Hughes
9087a9cbf4 Merge "Switch to toybox gzip." 
am: 5ce6dfbd36

Change-Id: I99e67a837a73aab9fcc37d53dcbc9a2182c4c37d
 2020-01-13 09:26:33 -08:00
Elliott Hughes
5ce6dfbd36 Merge "Switch to toybox gzip." 2020-01-13 17:21:02 +00:00
Jiyong Park
dc733d74bc Merge "use symlink for bundled APEX" 
am: 40ef4b926d

Change-Id: I71dfb372cc36dbd56800d5dd6498f9a95fc04bba
 2020-01-13 08:09:17 -08:00
Treehugger Robot
40ef4b926d Merge "use symlink for bundled APEX" 2020-01-13 16:05:45 +00:00
Ulyana Trafimovich
856f6d458a Merge "Use boot image extension in the JIT-zygote experiment." 
am: 4d9c97bd77

Change-Id: I76ea5217d5a8c5941b61c71d36b3421f6f792749
 2020-01-13 03:01:39 -08:00
Ulyana Trafimovich
4d9c97bd77 Merge "Use boot image extension in the JIT-zygote experiment." 2020-01-13 10:38:01 +00:00
Ulyana Trafimovich
10b887a354 Merge "Do not add jacocoagent to framework libraries in static coverage builds." 
am: 289bd28f17

Change-Id: I0933280da696845693dc7fcc798f98f541687cd8
 2020-01-13 02:26:50 -08:00
Ulyana Trafimovich
289bd28f17 Merge "Do not add jacocoagent to framework libraries in static coverage builds." 2020-01-13 10:25:16 +00:00
Yo Chiang
47d80cdf79 Merge "Don't dexpreopt APEX variant modules" 
am: 72d009e1ec

Change-Id: Ieb1c2c3b4a54f7d756adac816286ed4ff1cfb17a
 2020-01-12 19:18:26 -08:00
Yo Chiang
72d009e1ec Merge "Don't dexpreopt APEX variant modules" 2020-01-13 03:15:50 +00:00
Jiyong Park
931f464856 Merge "A test cc module is installable even if it's not available for platform" 
am: eecf99ce66

Change-Id: I5033edc711f7780c3367304644eed004ca816fd7
 2020-01-12 16:33:37 -08:00
Treehugger Robot
eecf99ce66 Merge "A test cc module is installable even if it's not available for platform" 2020-01-13 00:31:58 +00:00
Jiyong Park
0abc1b484d Prevent overridden APEX from being installed even when flattened 
Previously, both overridden APEX and overriding APEX were installed
together when TARGET_FLATTEN_APEX is set to true. This was because the
Make modules for flattened APEXes are phony where
LOCAL_OVERRIDES_MODULES isn't respected.

Fixing the problem by letting apex_manifest.pb for the overriding APEX
to override all modules for the overridden APEXes.

Bug: 147384966
Test: OVERRIDE_TARGET_FLATTEN_APEX=true m dump-files | grep
mediaprovider shows

:   out/target/product/coral/system/apex/com.google.android.mediaprovider/apex_manifest.pb
:   out/target/product/coral/system/apex/com.google.android.mediaprovider/apex_pubkey
:   out/target/product/coral/system/apex/com.google.android.mediaprovider/javalib/framework-mediaprovider.jar
:   out/target/product/coral/system/apex/com.google.android.mediaprovider/lib64/libfuse.so
:   out/target/product/coral/system/apex/com.google.android.mediaprovider/priv-app/MediaProvider/MediaProviderGoogle.apk

only

Change-Id: I6dc3fc7aaee0474cbad9fadbfce765be4b751328
 2020-01-12 23:31:56 +09:00
Automerger Merge Worker
9280bf9474 Merge "Sandbox soong_build by changing to root directory" am: ae7cddd5ad am: 70eefb570a 
Change-Id: I83d48a8f83702c1e79c8c956f59c4e574c08c508
 2020-01-11 07:17:14 +00:00
Colin Cross
70eefb570a Merge "Sandbox soong_build by changing to root directory" 
am: ae7cddd5ad

Change-Id: I5edc91d198fad76e5de6f79a775082f4f1df1cf9
 2020-01-10 23:00:57 -08:00