Commit Graph

52344 Commits

Author SHA1 Message Date
Anton Hansson
4208c81ab9 Merge "Add support for *_CPU_VARIANT_RUNTIME flags" 2019-02-22 12:34:02 +00:00
Orion Hodson
1cc983f9b2 Merge "Add libartpalette-system"
am: 6997dbd6ca

Change-Id: I3b57a5f1f7f697b78201cd9e33961e4c4aebebcb
2019-02-22 04:26:59 -08:00
Anton Hansson
768455a3d4 Merge "Move ART cpu properties to /vendor"
am: b5312392a0

Change-Id: I935d82d29fed18ba92839555703ecdbcaccd3b1e
2019-02-22 04:26:17 -08:00
Treehugger Robot
6997dbd6ca Merge "Add libartpalette-system" 2019-02-22 12:16:22 +00:00
Anton Hansson
b5312392a0 Merge "Move ART cpu properties to /vendor" 2019-02-22 12:14:49 +00:00
Anton Hansson
56a0405ec6 Merge "Add more BoardConfig variables to stash list"
am: 299ffb7870

Change-Id: I184a39af62e6e664dd67b4408a90b2b499703114
2019-02-22 02:27:37 -08:00
Anton Hansson
299ffb7870 Merge "Add more BoardConfig variables to stash list" 2019-02-22 10:21:07 +00:00
Logan Chien
a3146e8c0a Merge "Refine lsdump_paths.txt dependencies"
am: 7d35910451

Change-Id: I9f32fdb8c23810483b68fa4b3e325308d8227a86
2019-02-22 01:18:35 -08:00
Logan Chien
7d35910451 Merge "Refine lsdump_paths.txt dependencies" 2019-02-22 09:08:03 +00:00
Sundong Ahn
a1bd079779 Change to configstore 1.1
The configstore 1.2 will be deleted. So changed to configstore 1.1 in
PRODUCT_PACKAGES and remove configstore 1.2 in vndk.

Bug: 124531214
Test: build & boot
Test: adb shell lshal | grep configstore & check configstore 1.2
Change-Id: I2c9e1f8b5dc7616112d2602cac22059a05e59901
2019-02-22 12:06:03 +09:00
Bill Peckham
889b0c6b09 Convert common.RunAndWait method to raise an exception on subprocess failure.
Then refactor the code in merge_target_files.py to adapt to this semantic
change. This makes the code more consistent with existing releasetools code,
and it's easier to follow.

Test: Failure cases (verify exception), success cases (merged target generated)
Bug: 124521133
Change-Id: I56f04e360d8ff8ffcd6245359cdeb79f4565a9c4
2019-02-21 19:02:07 -08:00
Logan Chien
5f4e29b090 Refine lsdump_paths.txt dependencies
This commit moves $(LSDUMP_PATHS) from the prerequisite of
lsdump_paths.txt to the prerequisite of findlsdumps. This change makes
it possible to dump the list of lsdump files without actually building
all lsdump files.

Bug: 124829578
Test: make out/target/product/generic/lsdump_paths.txt
      # does not build the actual lsdump files
Test: make findlsdumps  # builds lsdump_paths.txt and all lsdump files
Change-Id: I924f1c0c61391e958521c376a061651f2a301adb
2019-02-22 10:55:44 +08:00
Dan Willemsen
46267cb4d8 Deprecate *.c[pp].arm
There never were too many users of this, and I've just converted the
last ones to Soong.

Test: diff build-aosp_arm.ninja
Test: treehugger
Change-Id: Ida6d486a62d0b521c1cd67f5f18c0ad0dbe957e3
2019-02-21 18:02:13 -08:00
Sasha Smundak
f097a2248c Merge "Add a wrapper file for the vts_config module."
am: f97ed91448

Change-Id: I9f2dd6a9b78ad825c92aac99a38dc2f8fb03891e
2019-02-21 16:30:50 -08:00
Treehugger Robot
f97ed91448 Merge "Add a wrapper file for the vts_config module." 2019-02-22 00:19:27 +00:00
Colin Cross
17ea341950 Use flags from Soong for d8 and r8
Use the flags provided by Soong when running d8 and r8.

Bug: 119270658
Test: m checkbuild
Change-Id: I9459ded386effc27c4c96f1e94f9ea2f8ed19319
2019-02-21 15:04:37 -08:00
Colin Cross
54ac6ed073 Merge "Get DEXPREOPT_BOOT_JARS_MODULES from Soong"
am: 6128b1e8d6

Change-Id: Ib4b879463f91750cdaf4a1a7f7ca75f4b841dfbc
2019-02-21 13:50:45 -08:00
Colin Cross
6128b1e8d6 Merge "Get DEXPREOPT_BOOT_JARS_MODULES from Soong" 2019-02-21 21:32:03 +00:00
Tianjie Xu
407c972bfa Merge "Dump a copy of metadata file for full OTA"
am: df5978803d

Change-Id: Iab5ccaad90927a88b9759357d8b8be1a7e0010ae
2019-02-21 10:34:54 -08:00
Tianjie Xu
df5978803d Merge "Dump a copy of metadata file for full OTA" 2019-02-21 18:00:55 +00:00
Xin Li
0e2ccf21c9 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: Ic9e8ff5af22140dc6ef8ff87a09f9292f9d30dc5
2019-02-21 09:32:40 -08:00
Colin Cross
39fb391e8f Merge "Update calls to dexpreopt_gen"
am: 0450863eca

Change-Id: Ied274cfd1a5d84fca0670b371a5ec820d11e79af
2019-02-21 07:14:08 -08:00
Colin Cross
0450863eca Merge "Update calls to dexpreopt_gen" 2019-02-21 15:00:40 +00:00
Anton Hansson
71b7f7fbd0 Add support for *_CPU_VARIANT_RUNTIME flags
Specified in the BoardConfig, and default to the value of the non
_RUNTIME variants.

These flags do not modify build-time compilation, but get written to
system properties on /vendor and can be inspected at runtime to
run/compile code for the specified cpu.

Migrate the bionic and ART cpu variant flags to use the new variables,
but leave the ART preopting using the non-_RUNTIME variants.

Bug: 120773446
Test: boot downstream device specifying CPU_VARIANT_RUNTIME flags
Test: grep dalvik.vm vendor/default.prop
Change-Id: Idc81110172582f38f84cca87f2eff140c5b5f9ac
2019-02-21 14:32:13 +00:00
Anton Hansson
30851f2540 Move ART cpu properties to /vendor
System properties relating to the physical hardware belong
on the vendor partition. Move the ART-related cpu variant
sysprops there.

This also brings the ART sysprops in line with the equivalent
bionic sysprops.

Bug: 120773446
Test: make, boot
Test: grep dalvik.vm vendor/default.prop
Change-Id: I3f843a7070dd0d9148737e040fe87d6461977d09
2019-02-21 14:13:44 +00:00
Anton Hansson
70222b21ee Add more BoardConfig variables to stash list
I would like to centralize/standardize the BoardConfig
variable sanity checking in a file similar to product_config.mk,
but for now just add a few more standard BoardConfig
variables to the .KATI_READONLY list.

Also fix the inconsistent indentation in this file.

Test: make
Change-Id: I2a878b95ffc07e3f5bc4eb4970775bdef347e094
2019-02-21 14:02:15 +00:00
Colin Cross
187c1b0741 Get DEXPREOPT_BOOT_JARS_MODULES from Soong
DEXPREOPT_BOOT_JARS_MODULES is not set any more in Make, stop
trying to pass it to Soong and let Soong export the value to Make.

Test: m checkbuild
Change-Id: I64de10236cbebc92c62fca137ae684e55cad1625
2019-02-20 21:46:31 -08:00
Colin Cross
36b5d1cd47 Update calls to dexpreopt_gen
dexpreopt_gen now requires a -out_dir argument, and does not need
DexPath, StripInputPath and StripOutputPath set.

Also use paths to Soong binaries for dex2oat, profman and aapt
so that they can be loaded as Path objects in Soong, and let
Soong handle the default for BootImageProfiles.

This reapplies I97b1865fd98d5108d9c63ff7a90a5591c7622526 with
fixes to disable preopt for Soong-only builds when the global
dexpreopt.config doesn't exist.

Test: m checkbuild
Change-Id: I5af9b749235823b7e1cfcfc55e121bfec413fb2f
2019-02-20 21:46:15 -08:00
Colin Cross
7cf3f8acdf Merge "Revert "Update calls to dexpreopt_gen"" am: 5b8e3837d2 am: 6393b2e0cb
am: 27901a19ed

Change-Id: Id1c737ed5c9e54331022f8be792948a7c147a094
2019-02-20 21:16:53 -08:00
Colin Cross
27901a19ed Merge "Revert "Update calls to dexpreopt_gen"" am: 5b8e3837d2
am: 6393b2e0cb

Change-Id: I6aef7e496c37763dcf80a88548d3380b3eb5bc49
2019-02-20 21:12:41 -08:00
Colin Cross
6393b2e0cb Merge "Revert "Update calls to dexpreopt_gen""
am: 5b8e3837d2

Change-Id: Ia755085892d9c862f98e511309f5377a1e345da2
2019-02-20 21:08:29 -08:00
Colin Cross
5b8e3837d2 Merge "Revert "Update calls to dexpreopt_gen"" 2019-02-21 05:03:41 +00:00
Colin Cross
862ab81669 Revert "Update calls to dexpreopt_gen"
This reverts commit 1d8df4a97f.

Reason for revert: broke ndk build

Change-Id: I99ab62653fc15b985edd42301ec085ba68389f51
2019-02-21 05:03:11 +00:00
Bill Peckham
ab2f68f38a Merge "Include merge_target_files.py deps in otatools.zip, use common argv processing." am: 30ee35f908 am: a3c90f2ac7
am: 68ac3ecf15

Change-Id: I3d9a1179d05cdbf1261a30f70869ca32041b5f09
2019-02-20 20:27:02 -08:00
Bill Peckham
68ac3ecf15 Merge "Include merge_target_files.py deps in otatools.zip, use common argv processing." am: 30ee35f908
am: a3c90f2ac7

Change-Id: I61cb000759ffdf012ce570ba20f83d060164310c
2019-02-20 20:22:53 -08:00
Colin Cross
1ea5dab11e Merge "Update calls to dexpreopt_gen" am: bcc341e5b0 am: a1e98d7dc5
am: 0b667f070c

Change-Id: Ib7e187e4f0548e696f43c5edbc3ddd13fea68caf
2019-02-20 20:22:36 -08:00
Bill Peckham
a3c90f2ac7 Merge "Include merge_target_files.py deps in otatools.zip, use common argv processing."
am: 30ee35f908

Change-Id: Iebde670f9d8cdc6601bbb1ea9cbc8fdb653b6c42
2019-02-20 20:18:44 -08:00
Colin Cross
0b667f070c Merge "Update calls to dexpreopt_gen" am: bcc341e5b0
am: a1e98d7dc5

Change-Id: I3bad2b492900d6566b4ceb3a7cafc8abdafc3b92
2019-02-20 20:18:25 -08:00
Colin Cross
a1e98d7dc5 Merge "Update calls to dexpreopt_gen"
am: bcc341e5b0

Change-Id: Ic0533eb3199e5f0f3ce5528abd9d55881af9618c
2019-02-20 20:14:21 -08:00
Bill Peckham
30ee35f908 Merge "Include merge_target_files.py deps in otatools.zip, use common argv processing." 2019-02-21 04:13:23 +00:00
Tianjie Xu
28a8ca98d0 Merge "Check the completeness of original blocks during target files validation" am: ef7737f921 am: 1f80b12aa0
am: 9312c2acc0

Change-Id: I7e49152b65ca4a96339ad7e83527a8a537f66165
2019-02-20 20:06:53 -08:00
Colin Cross
bcc341e5b0 Merge "Update calls to dexpreopt_gen" 2019-02-21 04:06:18 +00:00
Tianjie Xu
9312c2acc0 Merge "Check the completeness of original blocks during target files validation" am: ef7737f921
am: 1f80b12aa0

Change-Id: Ieaa5d86aa24b220df42ac639408bcc659e2359fd
2019-02-20 19:58:07 -08:00
Tianjie Xu
1f80b12aa0 Merge "Check the completeness of original blocks during target files validation"
am: ef7737f921

Change-Id: I410b86a99aad0b30a9ae1446a51ca8e0ffebac26
2019-02-20 19:54:59 -08:00
Tianjie Xu
ef7737f921 Merge "Check the completeness of original blocks during target files validation" 2019-02-21 03:41:35 +00:00
Tianjie Xu
6e25835bd8 Merge "OTA: Add an option to dump the metadata in ota package" am: 65cd6be679 am: f95abe47e4
am: 7934f14849

Change-Id: Ie7a33e28c2edae1df1577969f0872b27751a2eba
2019-02-20 19:23:49 -08:00
Tianjie Xu
7934f14849 Merge "OTA: Add an option to dump the metadata in ota package" am: 65cd6be679
am: f95abe47e4

Change-Id: Id54d08210242dc9c6d5fccd7b6ed8d310564129b
2019-02-20 19:20:44 -08:00
Tianjie Xu
f95abe47e4 Merge "OTA: Add an option to dump the metadata in ota package"
am: 65cd6be679

Change-Id: If8829d936b1ac8455cf54c7b3608641f028b0602
2019-02-20 19:15:29 -08:00
Tianjie Xu
65cd6be679 Merge "OTA: Add an option to dump the metadata in ota package" 2019-02-21 03:04:55 +00:00
Colin Cross
b72aa8e662 Merge "Fix boot_profile_jars.zip" am: 7ccf993d17 am: a7072ee157
am: fbc0661520

Change-Id: Id863baf51094f34b78da6ead0aaaa2438bf60d6b
2019-02-20 17:13:27 -08:00