Commit Graph

10290 Commits

Author SHA1 Message Date
Colin Cross
089d22dec0 Support passing resource zips to aapt2
am: a592e3eae9

Change-Id: Ifb2d44b5b00751bef8561448fff2034b42fe5e79
2019-02-20 12:09:52 -08:00
Colin Cross
a592e3eae9 Support passing resource zips to aapt2
A zip of resources provides an easy way to pass generated resources
to aapt2.

Bug: 74574557
Test: m FrameworksCoreTests
Change-Id: Ie4b1391521a27727694d03e42462b40d775614f8
2019-02-20 18:12:41 +00:00
Xin Li
2937bef649 [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
am: b81f48ee02 -s ours
am skip reason: subject contains skip directive

Change-Id: Idbcce9e2deb7fb6557f1bfb31ccfb4b73d1b228e
2019-02-20 09:37:09 -08:00
Xin Li
aa2c39b0db [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
am: 4e38954d3a -s ours
am skip reason: subject contains skip directive

Change-Id: I16162b63b4188ae7cbcfefad3b84db8154c75150
2019-02-20 08:38:51 -08:00
Xin Li
b81f48ee02 Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" 2019-02-20 16:26:00 +00:00
Dan Albert
ecbadc5b6c Merge "Revert "Remove armv7-a without neon support""
am: 48db2b15fb

Change-Id: I3f0bd183bb1dfe36fd9f6221c264c3c26d13e72f
2019-02-20 05:10:09 -08:00
Treehugger Robot
48db2b15fb Merge "Revert "Remove armv7-a without neon support"" 2019-02-20 12:56:37 +00:00
Anton Hansson
24a4d16048 Merge "Remove workaround for dupe RRO dirs"
am: e0233a5bdd

Change-Id: I26518da7992f59e431e9772cc95277aac1256819
2019-02-20 01:18:13 -08:00
Anton Hansson
e0233a5bdd Merge "Remove workaround for dupe RRO dirs" 2019-02-20 09:13:50 +00:00
Colin Cross
cd1cbd1f28 Merge "Allow Singletons to export Make variables"
am: 4c317f1cbb

Change-Id: I5b8ec3c9175d366220ebfe08231bdf11c1bf9af1
2019-02-20 00:42:06 -08:00
Treehugger Robot
4c317f1cbb Merge "Allow Singletons to export Make variables" 2019-02-20 08:38:23 +00:00
Sasha Smundak
e12437efa2 Merge "Improve documentation page layout"
am: a2b41a6e02

Change-Id: If9d1b3d26e18ebb7a121c153b41bd9a78bb713b6
2019-02-20 00:05:56 -08:00
Treehugger Robot
a2b41a6e02 Merge "Improve documentation page layout" 2019-02-20 07:50:16 +00:00
Colin Cross
22e64a35e2 Merge changes I7801fc7c,I7d407bd1
am: aa1491fd41

Change-Id: I0f5ccef4b23bd857f0cc26d56f9251aa991dc995
2019-02-19 23:21:16 -08:00
Colin Cross
aa1491fd41 Merge changes I7801fc7c,I7d407bd1
* changes:
  Add CopyOf utility method
  Fix a bug in OncePer.Get that could return a waiter
2019-02-20 07:15:17 +00:00
Colin Cross
84d6594f99 Merge "Don't check ABIs in SecondArchIsTranslated"
am: 98690957d0

Change-Id: Id8785e6aea57c6f97695e420e283514f3a39ff4d
2019-02-19 22:15:59 -08:00
Treehugger Robot
98690957d0 Merge "Don't check ABIs in SecondArchIsTranslated" 2019-02-20 06:04:58 +00:00
Pirama Arumuga Nainar
38bda6ed46 Merge "Override module's C flags when coverage is enabled"
am: e67c20ce90

Change-Id: Ic29108df7012a011f2d4878b57fba10e5accf957
2019-02-19 21:50:55 -08:00
Treehugger Robot
e67c20ce90 Merge "Override module's C flags when coverage is enabled" 2019-02-20 05:40:18 +00:00
Jiyong Park
db35d040c5 Merge "build apexkeys.txt"
am: d8ced0f1d9

Change-Id: I3ec80caf8cc90b5fd1312d4660cad732d17da129
2019-02-19 18:07:20 -08:00
Dan Willemsen
29318ab716 Merge "Use python / python2.7 prebuilts"
am: ac0f5d3643

Change-Id: I43a7c3a8db6fb57e51343c97a526816116255834
2019-02-19 18:06:25 -08:00
Treehugger Robot
d8ced0f1d9 Merge "build apexkeys.txt" 2019-02-20 01:53:44 +00:00
Dan Willemsen
ac0f5d3643 Merge "Use python / python2.7 prebuilts" 2019-02-20 01:51:06 +00:00
Dan Albert
8818f49989 Revert "Remove armv7-a without neon support"
Unfortunately we still need to build the NDK sysroot as non-NEON
since that's still supported, though it's no longer the default.

This reverts commit f4e0601c7e.

Test: treehugger
Test: rebuilt NDK sysroot and imported into the NDK, ran NDK tests
Bug: None
2019-02-19 13:53:01 -08:00
Colin Cross
ed023eca73 Allow Singletons to export Make variables
Register any Singletons that implement a MakeVars method as
MakeVarsProviders, and convert the hiddenapi singleton to
use it.

Test: m checkbuild
Change-Id: I6a2044ad34ef46a8b267762ddfeb51aa01d7734d
2019-02-19 12:45:14 -08:00
Colin Cross
454c087be6 Add CopyOf utility method
Add a utility method that returns a copy of a slice of strings.
This is primarily useful when appending to a string slice to avoid
accidentally reusing the backing array.

Test: util_test.go
Change-Id: I7801fc7ca19e27ddc9f1b1b452788b723c7f619c
2019-02-19 11:19:09 -08:00
Colin Cross
d7cfaeeebc Fix a bug in OncePer.Get that could return a waiter
OncePer.Get must call maybeWaitFor on the value it reads, otherwise
it could return a waiter instead of the real value.

Test: onceper_test.go
Change-Id: I7d407bd1c577dbb43bc14fa107d5f606bf2b1c67
2019-02-19 11:19:09 -08:00
Sasha Smundak
212e052aa7 Merge "soong_zip after dex should not fail when no *.dex files were generated"
am: bce06b6840

Change-Id: I3bdbac99f9293be32dc31dbec9d83a652aa4586e
2019-02-19 10:49:14 -08:00
Treehugger Robot
bce06b6840 Merge "soong_zip after dex should not fail when no *.dex files were generated" 2019-02-19 18:38:11 +00:00
Colin Cross
93a9e5e3a2 Don't check ABIs in SecondArchIsTranslated
SecondArchIsTranslated is only used to determine whether or not to
dexpreopt the second arch, so it should return false for the case
where the primary and secondary arches are X86_64 and X86, but the
primary arch also lists an Arm ABI.

Bug: 124711830
Test: m on failing build
Change-Id: I6afc2fdda466e0c406dbeada2e9c3df2bb6853bf
2019-02-19 18:18:30 +00:00
Pirama Arumuga Nainar
c7679de4ab Override module's C flags when coverage is enabled
Bug: http://b/116873221

Disable -Wframe-larger-than because building without optimization can
make frame larger.  Building dng_sdk with coverage results in a bigger
stack frame than the limit in C flags.

Get optimization level back to -O0 if module has a non-default
optimization level.  Not doing so causes link failures with
libneuralnetworks.so.

Test: Build with coverage.
Change-Id: I36b2979bb6a73023458c8de3241e975845bd36eb
2019-02-19 10:00:27 -08:00
yangbill
39cfd70a05 [SOONG] Not auto-generate test config if test_suite is cts
am: 4f41bc2bed

Change-Id: Ie9668b06e3849ed4ed7fbdf9b0ca0519bc777954
2019-02-19 06:41:17 -08:00
yangbill
4f41bc2bed [SOONG] Not auto-generate test config if test_suite is cts
Current soong use source code's under cts as the rule for judgement.
Should change to use test_suites define instead.

Bug: 124313692
Test: m hello_world_test, make sure test config be auog-enerated.
      Modified platform_testing/tests/example/native/Android.bp
      m hello_world_test, make sure test config not be auto-generatetd.

Change-Id: I1bc5216f73329d2a82d9ff29ccbede436dd2976c
2019-02-19 22:25:50 +08:00
Anton Hansson
b245abd5a7 Remove workaround for dupe RRO dirs
All the apps suffering from the duplicate resource directory
problem have been fixed.

Bug: 124035856
Test: make previously failing products
Change-Id: Iecdcdb3d4dab514d7f620876996d25f199d4bcfe
2019-02-19 13:55:15 +00:00
David Brazdil
37182f1fa8 Merge "Set usesNonSdkApi in manifest when Platform_apis=true"
am: 1f9e90a304

Change-Id: I7a01a1cf8a426a078869c7d56e11969cdb39df70
2019-02-19 01:58:55 -08:00
David Brazdil
1f9e90a304 Merge "Set usesNonSdkApi in manifest when Platform_apis=true" 2019-02-19 09:53:34 +00:00
Pirama Arumuga Nainar
79e5a54e9d Merge "Enable coverage for vendor-related libraries"
am: dd739bbdf2

Change-Id: I53a1742e3001a946938299f6a28dcd61c8014665
2019-02-18 21:26:45 -08:00
Pirama Arumuga Nainar
dd739bbdf2 Merge "Enable coverage for vendor-related libraries" 2019-02-19 05:19:41 +00:00
Jiyong Park
0ca3ce867c build apexkeys.txt
apexkeys.txt is a text file having APEX-to-keys mappings. The file is
included in the target-files package where it is used when re-sign the
APEXes with release keys.

Each line of the file consists of 5 fields:
1) name: file name of the APEX
2) public_key: the public key for the apex_payload.img of the APEX
3) private_key: the private key used to sign the apex_payload.img
4) container_certificate: the certificate used to sign the APEX zip
container
5) container_private_key: the private key used to sign the APEX zip
container

Bug: 124406181
Test: m out/soong/apexkeys.txt and inspect the content
Test: TARGET_BUILD_APPS=com.android.tzdata m dist and make sure
out/dist/apexkeys.txt exists
Change-Id: I1daa13ec50956323b97e15e8df7f1fbe5ea21d63
2019-02-19 14:13:36 +09:00
Logan Chien
2502d60804 Merge "Print --llndk to create_reference_dumps command"
am: 8a851cfce8

Change-Id: I94e5dee295372b79b9710b047ffb0477e0b2d371
2019-02-18 19:59:01 -08:00
Logan Chien
8a851cfce8 Merge "Print --llndk to create_reference_dumps command" 2019-02-19 03:48:12 +00:00
Colin Cross
7931d32a00 Merge changes from topic "dexpreopt_bootjars"
am: 49afb313ed

Change-Id: Icf46a334c41b43d5f3c59c3d56d97dfb97e13cc7
2019-02-18 19:04:36 -08:00
Colin Cross
653a5532bc Add java/testing.go for sysprop_test.go
am: e4759b9ab9

Change-Id: Id1c7f08b3bdf10af309720fdf6c2afaff1daca97
2019-02-18 19:04:16 -08:00
Colin Cross
7982dc9f45 Move dexpreopting of boot jars into Soong
am: 800fe13146

Change-Id: Id176637a9a0e74bcdb57a141927c711ccdb3af16
2019-02-18 19:03:47 -08:00
Colin Cross
49afb313ed Merge changes from topic "dexpreopt_bootjars"
* changes:
  Add more paths helper methods
  Add java/testing.go for sysprop_test.go
  Move dexpreopting of boot jars into Soong
2019-02-19 02:55:16 +00:00
Xin Li
4e38954d3a DO NOT MERGE - Merge PPRL.190205.001 into master
Bug: 124234733
Change-Id: Ic3332ad41c63a41ab998ae834bf45a87fa8cbf67
2019-02-18 15:57:59 -08:00
Dan Willemsen
0f0214699e Use python / python2.7 prebuilts
Bug: 117811537
Test: treehugger
Change-Id: I35b335edcfa202a45f55f588a643c62c2ced0f26
2019-02-18 19:34:00 +00:00
David Brazdil
d25060aa2d Set usesNonSdkApi in manifest when Platform_apis=true
The Platform_apis field in CompilerDeviceProperties currently has no
effect. Unify the behaviour with make and run manifest_fixer.py to
encode the information in the manifest. This is used to exempt
bundled apps and platform tests from hidden API access checks without
having a fixed whitelist of packages.

Bug: 113315999
Bug: 124671117
Test: m UbSystemUiJankTests && \
      aapt d xmltree \
      target/product/taimen/data/app/UbSystemUiJankTests/UbSystemUiJankTests.apk \
      AndroidManifest.xml | grep usesNonSdkApi
Change-Id: I20c392d91ee6275ef8139fbeb5b9700385abbc80
2019-02-18 19:21:02 +00:00
Dan Willemsen
84d5768bff Merge "Support building a par file that does not automatically run"
am: b03dc8e54e

Change-Id: I46a8020643face95c63963daceb7c7135dcd1dcb
2019-02-18 11:10:07 -08:00
Dan Willemsen
b03dc8e54e Merge "Support building a par file that does not automatically run" 2019-02-18 18:59:06 +00:00