StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,465 Commits 1 Branch 0 Tags
4c258d282b15bd0d9ba3de8dfa9762de1bd1adf4
Commit Graph

18465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jiyong Park
4c258d282b Add updatable_media_stub to framework 
The module framework is now a build-only library whose purpose is to
provide hidden APIs from the non-updatable part of the platform and APIs
from the modules. Merging updatable_media_stub to framework, like the
stub libraries from other modules.

As a result, updatable_media_stub can be removed from DefaultLibraries.

Bug: N/A
Test: m
Change-Id: I7f80716119ad6ac627e5666def9fe17112dcde3b
 2019-12-18 17:28:17 +09:00
Automerger Merge Worker
e2e6c72cd7 Merge "Enable covergae for ike.jar which will be in mainline module IPsec(IKE)" am: fa2ac9f6e9 am: abd4fde926 am: d04d769639 
Change-Id: I891237f0e8cedba332a8fd1ef5789d1a92632ce6
 2019-12-18 01:41:09 +00:00
Automerger Merge Worker
ff8d53d7de [automerger skipped] Merge "Override package name for VNDK APEX" am: 405c7ab959 am: c457e7876d am: c86586dd1d -s ours 
am skip reason: Change-Id I623d7a144418d7198f0bbf09c5dc983ed1a631c6 with SHA-1 0ed1b1b169 is in history

Change-Id: Ia6da443fbd49bc290fc5a107441f787929497cf0
 2019-12-18 01:40:59 +00:00
Automerger Merge Worker
63c4ed302d Merge changes Icbdf4979,I1a6f135d am: 70415ceb9e am: 89af2c6c22 am: 90ef5bc248 
Change-Id: I3a96a990db13f79b793244a86eee2adf84694d7c
 2019-12-18 01:40:41 +00:00
Automerger Merge Worker
d04d769639 Merge "Enable covergae for ike.jar which will be in mainline module IPsec(IKE)" am: fa2ac9f6e9 am: abd4fde926 
Change-Id: Ic6aaa2cacadc67c5b9325d15a05e6a41b3d3c08d
 2019-12-18 01:29:56 +00:00
Automerger Merge Worker
c86586dd1d Merge "Override package name for VNDK APEX" am: 405c7ab959 am: c457e7876d 
Change-Id: I39b2041e52cab1d465049e727e57b7ae3fbcd6e3
 2019-12-18 01:29:43 +00:00
Automerger Merge Worker
90ef5bc248 Merge changes Icbdf4979,I1a6f135d am: 70415ceb9e am: 89af2c6c22 
Change-Id: I7a4cd049ea18127cc989eaba328107a8b8e79606
 2019-12-18 01:29:24 +00:00
Yan Yan
abd4fde926 Merge "Enable covergae for ike.jar which will be in mainline module IPsec(IKE)" 
am: fa2ac9f6e9

Change-Id: Ifa4b235294bddb8f10fa7d56358b8bdbe3dffe02
 2019-12-17 17:25:20 -08:00
Yan Yan
fa2ac9f6e9 Merge "Enable covergae for ike.jar which will be in mainline module IPsec(IKE)" 2019-12-18 01:22:12 +00:00
Jooyung Han
c457e7876d Merge "Override package name for VNDK APEX" 
am: 405c7ab959

Change-Id: Ie58335b2468cf5838a82d08063ce353054c0b889
 2019-12-17 17:13:28 -08:00
Jooyung Han
89af2c6c22 Merge changes Icbdf4979,I1a6f135d 
am: 70415ceb9e

Change-Id: I8ca18cdaff1378f4d5a9bdfa2d6c8883ae8447a0
 2019-12-17 17:12:37 -08:00
Jooyung Han
405c7ab959 Merge "Override package name for VNDK APEX" 2019-12-18 01:10:36 +00:00
Jooyung Han
70415ceb9e Merge changes Icbdf4979,I1a6f135d 
* changes:
  Fix apex to override certificate
  Fix apex to follow deps of modules with stubs.
 2019-12-18 01:04:53 +00:00
Automerger Merge Worker
d4fc98eba3 Merge "Revert "Also package recursive jni_libs deps of android_apps as well as direct deps."" am: 9fd9b92d51 am: 91ef43f39e am: b9f21634ea 
Change-Id: I8a7191c050535882bbcbb9bad0141b31ef3abfb6
 2019-12-18 00:43:36 +00:00
Automerger Merge Worker
740c29c296 Declare manifest as input to test config fixer. am: f192d55382 am: 425dd46e31 am: 981226e28f 
Change-Id: I22b6073c7073af3dbe68ede6879859ac361d4aab
 2019-12-18 00:43:03 +00:00
Automerger Merge Worker
b9f21634ea Merge "Revert "Also package recursive jni_libs deps of android_apps as well as direct deps."" am: 9fd9b92d51 am: 91ef43f39e 
Change-Id: I36a63f1da329e8022d8f627dedc5352bba5d44be
 2019-12-18 00:31:13 +00:00
Automerger Merge Worker
981226e28f Declare manifest as input to test config fixer. am: f192d55382 am: 425dd46e31 
Change-Id: I069a927b21f907db64091c9e3cb6a3d4158a1431
 2019-12-18 00:30:48 +00:00
Joseph Murphy
91ef43f39e Merge "Revert "Also package recursive jni_libs deps of android_apps as well as direct deps."" 
am: 9fd9b92d51

Change-Id: Ice9ac150ea8f1a8c37c6401e3a3dfe4a9d135b49
 2019-12-17 16:28:49 -08:00
Joseph Murphy
9fd9b92d51 Merge "Revert "Also package recursive jni_libs deps of android_apps as well as direct deps."" 2019-12-18 00:23:36 +00:00
Jaewoong Jung
425dd46e31 Declare manifest as input to test config fixer. 
am: f192d55382

Change-Id: Ia10e74a3176d47b3324c44f52e6fbad9a6147bc8
 2019-12-17 16:18:52 -08:00
Lorenzo Colitti
2973c1106f Revert "Also package recursive jni_libs deps of android_apps as well as direct deps." 
This reverts commit 6f907ad3dd.

Reason for revert: Broke FrameworksNetSmokeTests

Bug: 146456945
Change-Id: Ibef7bb80c532e70cfcfb974f51a99ed25437a343
 2019-12-18 00:15:07 +00:00
evitayan
13b0d51ffb Enable covergae for ike.jar which will be in mainline module IPsec(IKE) 
Enable jacoco for ike.jar to set up code coverage. ike will be
shipped in mainline module com.android.ipsec

Bug: 146012420
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false
Change-Id: I886551d980c0d9651b11c80051f17609bb3531d8
 2019-12-17 15:23:38 -08:00
Jaewoong Jung
f192d55382 Declare manifest as input to test config fixer. 
It needs to be an implicit input for it to work consistently.

Test: m GooglePermissionControllerUnitTests
Bug: 145011263
Change-Id: Ib71d768e750faa5b577652e79a18d05929bde52f
 2019-12-17 14:22:19 -08:00
Automerger Merge Worker
7356dee847 Merge "Also package recursive jni_libs deps of android_apps as well as direct deps." am: ff8cb1e69e am: d6800751c7 am: d10be18767 
Change-Id: I5728e95988e46f10fd8a5c7d108b6679fa33f53a
 2019-12-17 21:24:55 +00:00
Automerger Merge Worker
d10be18767 Merge "Also package recursive jni_libs deps of android_apps as well as direct deps." am: ff8cb1e69e am: d6800751c7 
Change-Id: I2b9dd978f506ee6022ba05bf46f754f7dce7d032
 2019-12-17 21:10:49 +00:00
Peter Collingbourne
d6800751c7 Merge "Also package recursive jni_libs deps of android_apps as well as direct deps." 
am: ff8cb1e69e

Change-Id: I22f9f842f7125a5ff86abedd70387456bd26210f
 2019-12-17 12:55:13 -08:00
Peter Collingbourne
ff8cb1e69e Merge "Also package recursive jni_libs deps of android_apps as well as direct deps." 2019-12-17 20:51:18 +00:00
Colin Cross
9c8f687584 Move imageMutator before archMutator 
Run the imageMutator between osMutator and archMutator so that
different arch variants can be set for the different partitions.

Bug: 142286466
Test: m checkbuild
Change-Id: I65d05714b75aa462bf9816da60fdc2deda4de593
 2019-12-17 11:16:37 -08:00
Jooyung Han
27151d93b6 Override package name for VNDK APEX 
com.android.vndk.v<VER> is overridden with
com.google.android.vndk.v<VERE>.

Test: m com.android.vndk.current
    && aapt2 dump badging ../system/apex/com.android.vndk.current.apex
Change-Id: I623d7a144418d7198f0bbf09c5dc983ed1a631c6
Merged-In: I623d7a144418d7198f0bbf09c5dc983ed1a631c6
(cherry picked from commit 0ed1b1b169)
 2019-12-17 15:22:21 +00:00
Jooyung Han
37c6310671 Merge "Override package name for VNDK APEX" 2019-12-17 15:00:32 +00:00
Automerger Merge Worker
f48062022d Merge "hostdex:true modules are available for platform" am: 7cf4b5de6b am: 880fd78f33 am: 789ccacdbe 
Change-Id: I8891a09d18bf158bd7a209bf7420c40ed5529d43
 2019-12-17 06:21:51 +00:00
Automerger Merge Worker
a4e8d54c46 Merge "Support apps attribute in apex_defaults" am: 1d1a920794 am: dc1c78fcd1 am: 42ff47b5df 
Change-Id: I284556504568cd9aac6dd3a6e342e8248fccf557
 2019-12-17 06:21:34 +00:00
Jooyung Han
f121a657c9 Fix apex to override certificate 
The rules for apex certificate:
1. <unspecified>: use <default app cerficicate>
2. name: use <default app cerficiate dir>/<name>(.x509.pem|.pk8)
3. :module: use specified by <module>

Certificates can be overridden by PRODUCT_CERTIFICATE_OVERRIDES.

Currently, 1) and 2) aren't overridden by PRODUCT_CERTIFICATE_OVERRIDES,
which should be.

Bug: n/a
Test: m (apex_test.go amended)
Change-Id: Icbdf4979613ef10127ecc02f3debd6a798460532
 2019-12-17 15:20:50 +09:00
Jooyung Han
671f1ce75e Fix apex to follow deps of modules with stubs. 
In case that an apex module depends on a module with stubs directly
*and* indirectly, the build system should follow the deps graph further.

Note that WalkDeps() visits deps in DFS and it won't visit again visited
modules.

Bug: n/a
Test: m (apex_test.go amended)
Change-Id: I1a6f135dbda6d1eb641575a3fbbc9bbee0622076
 2019-12-17 15:18:54 +09:00
Automerger Merge Worker
789ccacdbe Merge "hostdex:true modules are available for platform" am: 7cf4b5de6b am: 880fd78f33 
Change-Id: I1e226e84004d529e1000482413c7b975ce45612f
 2019-12-17 06:14:33 +00:00
Jiyong Park
880fd78f33 Merge "hostdex:true modules are available for platform" 
am: 7cf4b5de6b

Change-Id: Ia8ae86ffef5e2e3015cdfc3832798b54e0379f18
 2019-12-16 22:04:52 -08:00
Automerger Merge Worker
42ff47b5df Merge "Support apps attribute in apex_defaults" am: 1d1a920794 am: dc1c78fcd1 
Change-Id: I2ae2f868effd2997b2eea6cf8b301e2e04e446d9
 2019-12-17 06:03:19 +00:00
Treehugger Robot
7cf4b5de6b Merge "hostdex:true modules are available for platform" 2019-12-17 06:02:05 +00:00
Automerger Merge Worker
b5e0ad2235 Merge "Avoid duplicated classes for boot dex jars" am: 97e09d0dee am: a40bb59741 am: 991e40ba6f 
Change-Id: I623189eaafd82847ef07c59c9c83e6e42854f2fa
 2019-12-17 05:51:36 +00:00
Jooyung Han
dc1c78fcd1 Merge "Support apps attribute in apex_defaults" 
am: 1d1a920794

Change-Id: Ibfa92edacbb7c041d6d1ac01f5a0baf64b9562a3
 2019-12-16 21:48:50 -08:00
Treehugger Robot
1d1a920794 Merge "Support apps attribute in apex_defaults" 2019-12-17 05:44:42 +00:00
Automerger Merge Worker
991e40ba6f Merge "Avoid duplicated classes for boot dex jars" am: 97e09d0dee am: a40bb59741 
Change-Id: I0ec332afa9e4b2ff24ba7f426b2c8f8711fc0316
 2019-12-17 05:38:20 +00:00
Jiyong Park
a40bb59741 Merge "Avoid duplicated classes for boot dex jars" 
am: 97e09d0dee

Change-Id: Iaf95a4cd63f57df1b5e6fab64c382308f3682e0d
 2019-12-16 21:19:43 -08:00
Treehugger Robot
97e09d0dee Merge "Avoid duplicated classes for boot dex jars" 2019-12-17 05:14:25 +00:00
Peter Collingbourne
6f907ad3dd Also package recursive jni_libs deps of android_apps as well as direct deps. 
Previously, android_app targets for which a.shouldEmbedJnis(ctx) = true
(e.g. CtsSelinuxTargetSdk25TestCases) would need to specify all of their
recursive library dependencies, including for example libc++ when depending
on the platform libc++. This means unnecessary churn when we add a new
dependency to libc++ (e.g. libunwind [1]). To avoid the churn and allow
jni_libs clauses to be simplified, make the build system search for the
recursive dependencies and automatically include them.

This change allows us to remove code that was previously adding NDK libc++
as a special case, as it is now covered by the generic code.

Also fix some improper quoting that was exposed as a result of this change
causing more files to be packaged than before.

[1] https://android-review.googlesource.com/q/topic:%22libunwind-so%22

Bug: 144430859
Change-Id: I3d6fbcce75bc108a982eb7483992a4b202056339
 2019-12-16 15:20:09 -08:00
Automerger Merge Worker
9fc4b42dc8 Merge "Add $ORIGIN to fuzzer-coverage sanitized .so's." am: a1682631eb am: 630f2d4caf am: 50a9cadcf4 
Change-Id: I65e2db8c383a398d9cd14da0f29ca14762c89bcd
 2019-12-16 21:37:28 +00:00
Automerger Merge Worker
95747ac10b Merge changes from topic "separate_code" am: 894cdee30a am: 7346c709e2 am: a923639223 
Change-Id: I65b77b31c770382abf7002a90e111a3ffe25e35a
 2019-12-16 21:36:54 +00:00
Automerger Merge Worker
67eebe6442 Revert "Revert "soong: upgrade Android platform to clang-r370808"" am: eb20744361 am: c2e2dce120 am: 1ae7cbd085 
Change-Id: I9582942220289d30dc21afddaeb477dd67732b80
 2019-12-16 21:36:52 +00:00
Automerger Merge Worker
ca47eaffce [automerger skipped] Merge "Use empty string for core image variant" am: bd0624304e am: 2387d4f65e am: 7ff356d5a0 -s ours 
am skip reason: Change-Id Ida4534d9a4d6176236aaa480fed359ce27acfaa1 with SHA-1 7d114b28e6 is in history

Change-Id: I9844db46e1a21ad0f09b85fc196d7d749a97c11f
 2019-12-16 21:34:38 +00:00
Automerger Merge Worker
50a9cadcf4 Merge "Add $ORIGIN to fuzzer-coverage sanitized .so's." am: a1682631eb am: 630f2d4caf 
Change-Id: Icf7e06ae9ef99b6a05803931c83d425cb4ab44b0
 2019-12-16 21:33:47 +00:00