Tri Vo
34f72c8e30
Merge "recovery: install product_file_contexts and product_property_contexts" am: 9f18c64d07
...
am: 6a03c1677b
2019-03-07 12:06:57 -08:00
Tri Vo
6a03c1677b
Merge "recovery: install product_file_contexts and product_property_contexts"
...
am: 9f18c64d07
2019-03-07 11:58:25 -08:00
Tri Vo
9f18c64d07
Merge "recovery: install product_file_contexts and product_property_contexts"
2019-03-07 18:32:48 +00:00
nelsonli
224e103308
Build System: Solve dependency problem for test
...
1. A test can add a runtime dependent test module by just setting
LOCAL_REQUIRED_MODULES or LOCAL_TARGET_REQUIRED_MODULES. Then the dependent test
module will be copied to testcase folder.
2. Do not install to $(TARGET_OUT_DATA) for testcase
BUG: 117224272
Test: 1. (a) vi cts/tests/tests/text/Android.mk
(b) add LOCAL_REQUIRED_MODULES := CtsPrintTestCases
(c) m -j CtsTextTestCases
(d) Then, CtsPrintTestCases should also be built to testcase folder like below.
./target/product/generic_arm64/testcases/CtsPrintTestCases
Change-Id: I24ea3783486c54a05cfa9d3d0375b977afc230f8
2019-03-07 14:08:35 +08:00
Dan Willemsen
b952b5e4c3
Build everything in PRODUCT_HOST_PACKAGES
...
This should only add extra host packages that were in
PRODUCT_HOST_PACKAGES and not PRODUCT_PACKAGES.
That shouldn't be very many things -- user builds will build a few more
host tools that used to be in PRODUCT_PACKAGES_DEBUG, etc.
Test: treehugger
Change-Id: I6768b76db74ea049de90eef326d1e314eb4ef848
Merged-In: I6768b76db74ea049de90eef326d1e314eb4ef848
2019-03-06 15:41:19 -08:00
Dan Willemsen
3d05a08a6f
Reland "First pass at creating PRODUCT_HOST_PACKAGES"
...
Adds icu-data_host_runtime_apex to fix unbundled builds which pull it in
via PRODUCT_PACKAGES, but are missing packages that would pull it in via
PRODUCT_HOST_PACKAGES.
Test: build/soong/build_test.bash
Test: in ub-timezonedata-master; tapas TimeZoneData; m
Change-Id: I1583c7582b386c3e8478711cb1df340518d763c1
Merged-In: I1583c7582b386c3e8478711cb1df340518d763c1
2019-03-06 14:46:06 -08:00
Dan Willemsen
51e3b38508
Build everything in PRODUCT_HOST_PACKAGES
...
This should only add extra host packages that were in
PRODUCT_HOST_PACKAGES and not PRODUCT_PACKAGES.
That shouldn't be very many things -- user builds will build a few more
host tools that used to be in PRODUCT_PACKAGES_DEBUG, etc.
Test: treehugger
Change-Id: I6768b76db74ea049de90eef326d1e314eb4ef848
2019-03-06 11:18:05 -08:00
Dan Willemsen
4a70a19f84
Reland "First pass at creating PRODUCT_HOST_PACKAGES"
...
Adds icu-data_host_runtime_apex to fix unbundled builds which pull it in
via PRODUCT_PACKAGES, but are missing packages that would pull it in via
PRODUCT_HOST_PACKAGES.
Test: build/soong/build_test.bash
Test: in ub-timezonedata-master; tapas TimeZoneData; m
Change-Id: I1583c7582b386c3e8478711cb1df340518d763c1
2019-03-04 18:03:14 -08:00
Colin Cross
bdc8d57cc5
Merge "Update manifest merger to use binary" am: e34ff5ca5d am: 9c6a64ea64
...
am: 51fea3d3b4
2019-03-04 14:24:43 -08:00
Colin Cross
51fea3d3b4
Merge "Update manifest merger to use binary" am: e34ff5ca5d
...
am: 9c6a64ea64
2019-03-04 14:20:35 -08:00
Colin Cross
9c6a64ea64
Merge "Update manifest merger to use binary"
...
am: e34ff5ca5d
2019-03-04 14:13:27 -08:00
Colin Cross
e34ff5ca5d
Merge "Update manifest merger to use binary"
2019-03-04 22:02:09 +00:00
Nicolas Geoffray
e7379ba071
Merge "Pass the --api-flags to appcompat explicitly." am: 53cfd9275b am: 40ccefa404
...
am: 05cee18432
2019-03-04 06:31:55 -08:00
Nicolas Geoffray
05cee18432
Merge "Pass the --api-flags to appcompat explicitly." am: 53cfd9275b
...
am: 40ccefa404
2019-03-04 06:27:48 -08:00
Nicolas Geoffray
40ccefa404
Merge "Pass the --api-flags to appcompat explicitly."
...
am: 53cfd9275b
2019-03-04 06:23:38 -08:00
Nicolas Geoffray
53cfd9275b
Merge "Pass the --api-flags to appcompat explicitly."
2019-03-04 14:14:39 +00:00
Julien Desprez
9df0b2d006
Merge "Add a placeholder EXTRA_OPTIONS to inject more tradefed options" am: 20a50f75a3 am: cab4032f3c
...
am: 0e0ef29e9f
2019-03-01 17:24:01 -08:00
Julien Desprez
0e0ef29e9f
Merge "Add a placeholder EXTRA_OPTIONS to inject more tradefed options" am: 20a50f75a3
...
am: cab4032f3c
2019-03-01 17:15:03 -08:00
Julien Desprez
cab4032f3c
Merge "Add a placeholder EXTRA_OPTIONS to inject more tradefed options"
...
am: 20a50f75a3
2019-03-01 17:00:15 -08:00
Julien Desprez
4e9a9485f4
Add a placeholder EXTRA_OPTIONS to inject more tradefed options
...
Simply remove the placeholder in makefiles, for now I am
not sure we need to support this in makefiles at all.
Test: call the sed method
Bug: 124024827
Change-Id: Iae78ae86c20c5da6b7314b749f54983a312c4a7d
2019-03-01 11:36:36 -08:00
Yifan Hong
7a82913627
Merge "Build ODM manifests and fragments for each SKU." am: 5a4696e460 am: 9abd15f3c1
...
am: 934174f0bd
2019-03-01 11:00:14 -08:00
Yifan Hong
934174f0bd
Merge "Build ODM manifests and fragments for each SKU." am: 5a4696e460
...
am: 9abd15f3c1
2019-03-01 10:55:04 -08:00
Yifan Hong
9abd15f3c1
Merge "Build ODM manifests and fragments for each SKU."
...
am: 5a4696e460
2019-03-01 10:50:35 -08:00
Yifan Hong
5a4696e460
Merge "Build ODM manifests and fragments for each SKU."
2019-03-01 18:32:32 +00:00
Anton Hansson
3a1ba7d721
Merge "Move BoardConfig strip / READONLY marking" am: e0ce6ca8a5 am: 393de8744d
...
am: 79d283621c
2019-03-01 07:59:14 -08:00
Anton Hansson
d754e652d7
Merge "Move combo makefile parsing" am: 451951c139 am: 0eca386c7e
...
am: 7f98d99518
2019-03-01 07:54:07 -08:00
Colin Cross
62fc068b69
Merge "Use flags from Soong for d8 and r8" am: 5852c93585 am: fb770b4f84
...
am: ecc4607403
2019-03-01 07:51:15 -08:00
Anton Hansson
79d283621c
Merge "Move BoardConfig strip / READONLY marking" am: e0ce6ca8a5
...
am: 393de8744d
2019-03-01 07:51:00 -08:00
Anton Hansson
7f98d99518
Merge "Move combo makefile parsing" am: 451951c139
...
am: 0eca386c7e
2019-03-01 07:49:27 -08:00
Colin Cross
ecc4607403
Merge "Use flags from Soong for d8 and r8" am: 5852c93585
...
am: fb770b4f84
2019-03-01 07:47:03 -08:00
Anton Hansson
393de8744d
Merge "Move BoardConfig strip / READONLY marking"
...
am: e0ce6ca8a5
2019-03-01 07:46:50 -08:00
Anton Hansson
0eca386c7e
Merge "Move combo makefile parsing"
...
am: 451951c139
2019-03-01 07:42:26 -08:00
Colin Cross
fb770b4f84
Merge "Use flags from Soong for d8 and r8"
...
am: 5852c93585
2019-03-01 07:40:35 -08:00
Anton Hansson
e0ce6ca8a5
Merge "Move BoardConfig strip / READONLY marking"
2019-03-01 15:34:36 +00:00
Anton Hansson
451951c139
Merge "Move combo makefile parsing"
2019-03-01 15:34:19 +00:00
Colin Cross
5852c93585
Merge "Use flags from Soong for d8 and r8"
2019-03-01 15:28:29 +00:00
Anton Hansson
d488d2d7d7
Move BoardConfig strip / READONLY marking
...
This moves the BoardConfig READONLY marking being product.mk's
responsibility to board_config.mk.
Also unify it with the BUILD_BROKEN_* setting handling, and
READONLY a few additional variables.
Test: build_test
Change-Id: Ifcfef588aa459223d6d7f017413d1681f341297f
2019-03-01 10:04:18 +00:00
Anton Hansson
192798513e
Move combo makefile parsing
...
These files may be setting variables usually defined in the
BoardConfig. This moves that setting into board_config.mk so
that the relevant variables can be made readonly.
Test: build_test
Test: diff presubmit target_files vs base cl
Change-Id: I4dab09fa67c0f2e88a8ce1402a35b4ef5f8a0560
2019-03-01 09:54:33 +00:00
Nicolas Geoffray
ac1f90c39c
Pass the --api-flags to appcompat explicitly.
...
Bug: 125794065
Test: m && appcompat logs contain data
Change-Id: Idef875138d6670efc9ed7b9c63f653229b173d3e
2019-02-28 13:51:14 +00:00
Anton Hansson
c474edeaaf
Merge "Make it an error to specify the wrong ARCH_VARIANT" am: c651ef8529 am: 04d20252f9
...
am: c33384d895
2019-02-28 02:47:56 -08:00
Anton Hansson
c33384d895
Merge "Make it an error to specify the wrong ARCH_VARIANT" am: c651ef8529
...
am: 04d20252f9
2019-02-28 02:43:45 -08:00
Anton Hansson
d783c5bca9
Merge "Move WITH_DEXPREOPT default value" am: 67d3081d3f am: 5141484847
...
am: d3a8a46e3d
2019-02-28 02:41:00 -08:00
Anton Hansson
36784f93a2
Merge "Modify INTERNAL_KERNEL_CMDLINE instead of BOARD_ variant" am: 2507ce486d am: 3df97964e6
...
am: 81651dcf2e
2019-02-28 02:39:54 -08:00
Anton Hansson
04d20252f9
Merge "Make it an error to specify the wrong ARCH_VARIANT"
...
am: c651ef8529
2019-02-28 02:38:27 -08:00
Anton Hansson
d3a8a46e3d
Merge "Move WITH_DEXPREOPT default value" am: 67d3081d3f
...
am: 5141484847
2019-02-28 02:36:34 -08:00
Anton Hansson
81651dcf2e
Merge "Modify INTERNAL_KERNEL_CMDLINE instead of BOARD_ variant" am: 2507ce486d
...
am: 3df97964e6
2019-02-28 02:35:43 -08:00
Anton Hansson
5141484847
Merge "Move WITH_DEXPREOPT default value"
...
am: 67d3081d3f
2019-02-28 02:32:25 -08:00
Anton Hansson
3df97964e6
Merge "Modify INTERNAL_KERNEL_CMDLINE instead of BOARD_ variant"
...
am: 2507ce486d
2019-02-28 02:31:34 -08:00
Anton Hansson
c651ef8529
Merge "Make it an error to specify the wrong ARCH_VARIANT"
2019-02-28 10:29:05 +00:00
Anton Hansson
67d3081d3f
Merge "Move WITH_DEXPREOPT default value"
2019-02-28 10:26:31 +00:00
Anton Hansson
2507ce486d
Merge "Modify INTERNAL_KERNEL_CMDLINE instead of BOARD_ variant"
2019-02-28 10:26:18 +00:00
Anton Hansson
6ad39ba0c0
Merge "Consolidate some BoardConfig variable checks" am: d265f52005 am: 3f6e03334a
...
am: c20ea064d1
2019-02-28 01:38:41 -08:00
Anton Hansson
c20ea064d1
Merge "Consolidate some BoardConfig variable checks" am: d265f52005
...
am: 3f6e03334a
2019-02-28 01:34:29 -08:00
Anton Hansson
3f6e03334a
Merge "Consolidate some BoardConfig variable checks"
...
am: d265f52005
2019-02-28 01:30:20 -08:00
Anton Hansson
d265f52005
Merge "Consolidate some BoardConfig variable checks"
2019-02-28 09:21:41 +00:00
Anton Hansson
be1f9cb2fa
Make it an error to specify the wrong ARCH_VARIANT
...
It was previously a warning to set an incorrect ARCH_VARIANT
when CPU_VARIANT was set to a cpu for which we knew the arch.
Make it an error, as there are no offenders in the tree.
Re-structure the code to make it a little clearer when you get
a default and when you get an error.
Test: build_test
Change-Id: I5821a8162a59e8c2aed2370068f9eb656ced9d99
2019-02-27 17:27:16 +00:00
Anton Hansson
74dc00b88f
Move WITH_DEXPREOPT default value
...
This allows setting the variable READONLY after reading the BoardConfig.
This is safe to do because this flag is only set in BoardConfig.mk
files. The same is not true for many of the other default preopt flags,
like DEX_PREOPT_DEFAULT or WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY
which are set in mixture of product / board config files.
Test: boot blueline
Change-Id: I961ba581f9790bcdc7cf6b36d8b53bcdb8861a92
2019-02-27 15:03:23 +00:00
Anton Hansson
72e36f0278
Modify INTERNAL_KERNEL_CMDLINE instead of BOARD_ variant
...
The current modification of the variable within the build system
prohibits making the variable readonly.
Test: build_test
Test: boot blueline
Change-Id: Iec6058a163b5951db389d4adc0d9d0397431efb1
2019-02-27 14:29:01 +00:00
Anton Hansson
b9544694a5
Consolidate some BoardConfig variable checks
...
Move a few more variable stripping/sanity checking from
config.mk to board_config.mk
Test: build_test
Change-Id: I93fde7293de38398039dbb679b2399c8a68c190d
2019-02-27 14:07:43 +00:00
Anton Hansson
1167d36a18
Merge "Split out board_config.mk" am: 45747a037a am: bff3401e7f
...
am: a4306d0df9
2019-02-27 05:39:39 -08:00
Anton Hansson
a4306d0df9
Merge "Split out board_config.mk" am: 45747a037a
...
am: bff3401e7f
2019-02-27 05:35:23 -08:00
Anton Hansson
bff3401e7f
Merge "Split out board_config.mk"
...
am: 45747a037a
2019-02-27 05:32:13 -08:00
Anton Hansson
45747a037a
Merge "Split out board_config.mk"
2019-02-27 13:21:17 +00:00
Colin Cross
7293c1e4b9
Update manifest merger to use binary
...
Manifest merger is now a java_binary instead of a collection of jars,
it can use the single binary as the dependency.
Bug: 112607039
Test: m checkbuild
Change-Id: Id97b01542314cb165ebf7c90409a09482d8c53bc
2019-02-27 06:18:35 +00:00
Yifan Hong
baff3dda9e
Merge "Fix dynamic partition size check for devices with recovery" am: 55ebd61486 am: d8da08795d
...
am: 45d5ba6ce1
2019-02-26 18:38:57 -08:00
Yifan Hong
45d5ba6ce1
Merge "Fix dynamic partition size check for devices with recovery" am: 55ebd61486
...
am: d8da08795d
2019-02-26 18:29:36 -08:00
Yifan Hong
d8da08795d
Merge "Fix dynamic partition size check for devices with recovery"
...
am: 55ebd61486
2019-02-26 18:20:17 -08:00
Treehugger Robot
55ebd61486
Merge "Fix dynamic partition size check for devices with recovery"
2019-02-27 01:58:58 +00:00
Anton Hansson
bb76ce825c
Split out board_config.mk
...
Similar to product_config.mk, this contains the logic for reading
BoardConfig.mk, and will be expanded to sanity-check variables
set in the BoardConfig etc.
Test: build_test
Change-Id: I4f8d7cfbf1506ae4268c82c9554680259958b313
2019-02-26 16:27:48 +00:00
Dan Willemsen
8c979fa522
Merge "Deprecate *.c[pp].arm" am: fb8c9673e7 am: 5d340e1552
...
am: 662380e517
2019-02-25 22:08:32 -08:00
Dan Willemsen
662380e517
Merge "Deprecate *.c[pp].arm" am: fb8c9673e7
...
am: 5d340e1552
2019-02-25 21:57:21 -08:00
Nicolas Geoffray
66ce15bd22
Merge "Support for install multiple boot images." am: 3b813d10bb am: 605280d1dc
...
am: 3278e301b9
2019-02-25 21:06:05 -08:00
Nicolas Geoffray
3278e301b9
Merge "Support for install multiple boot images." am: 3b813d10bb
...
am: 605280d1dc
2019-02-25 20:10:07 -08:00
Yifan Hong
accf09b2e0
Fix dynamic partition size check for devices with recovery
...
Devices with TARGET_NO_RECOVERY unset will contain a patch
of the recovery image in the system image. Fix
corresponding size checks.
Fixes: 120043292
Bug: 124489494
Test: build cuttlefish with DAP
Change-Id: I508881f421672180ab852c0f9216184b925d83ad
2019-02-25 16:10:43 -08:00
Dan Willemsen
5d340e1552
Merge "Deprecate *.c[pp].arm"
...
am: fb8c9673e7
2019-02-25 14:57:01 -08:00
Dan Willemsen
fb8c9673e7
Merge "Deprecate *.c[pp].arm"
2019-02-25 21:28:31 +00:00
Nicolas Geoffray
605280d1dc
Merge "Support for install multiple boot images."
...
am: 3b813d10bb
2019-02-24 05:46:37 -08:00
Nicolas Geoffray
3b813d10bb
Merge "Support for install multiple boot images."
2019-02-24 13:37:01 +00:00
Paul Duffin
f0d5d718af
Merge "Remove usages of legacy-test and legacy-android-test" am: 8f948fe292 am: 44b8a17093
...
am: 0854851f7e
2019-02-22 20:53:48 -08:00
Anton Hansson
bf590c2aaa
Merge "Add support for *_CPU_VARIANT_RUNTIME flags" am: 4208c81ab9 am: bc732bf45b
...
am: a2d24017f3
2019-02-22 20:51:34 -08:00
Anton Hansson
ee466e1a5f
Merge "Move ART cpu properties to /vendor" am: b5312392a0 am: 768455a3d4
...
am: 8fae47028f
2019-02-22 20:49:23 -08:00
Anton Hansson
751f86f81a
Merge "Add more BoardConfig variables to stash list" am: 299ffb7870 am: 56a0405ec6
...
am: 17a4def424
2019-02-22 20:48:07 -08:00
Logan Chien
26e7e59514
Merge "Refine lsdump_paths.txt dependencies" am: 7d35910451 am: a3146e8c0a
...
am: e12bfc81b9
2019-02-22 20:47:04 -08:00
Sasha Smundak
baaaf97e72
Merge "Add a wrapper file for the vts_config module." am: f97ed91448 am: f097a2248c
...
am: dd3122dc48
2019-02-22 20:45:30 -08:00
Colin Cross
6ef81e0397
Merge "Get DEXPREOPT_BOOT_JARS_MODULES from Soong" am: 6128b1e8d6 am: 54ac6ed073
...
am: 0ee78f3aa1
2019-02-22 20:43:35 -08:00
Paul Duffin
0854851f7e
Merge "Remove usages of legacy-test and legacy-android-test" am: 8f948fe292
...
am: 44b8a17093
2019-02-22 20:38:13 -08:00
Tianjie Xu
376907886a
Merge "Dump a copy of metadata file for full OTA" am: df5978803d am: 407c972bfa
...
am: 061dfe08eb
2019-02-22 20:37:16 -08:00
Anton Hansson
a2d24017f3
Merge "Add support for *_CPU_VARIANT_RUNTIME flags" am: 4208c81ab9
...
am: bc732bf45b
2019-02-22 20:36:47 -08:00
Colin Cross
6389c88239
Merge "Update calls to dexpreopt_gen" am: 0450863eca am: 39fb391e8f
...
am: c4114d9641
2019-02-22 20:35:33 -08:00
Anton Hansson
8fae47028f
Merge "Move ART cpu properties to /vendor" am: b5312392a0
...
am: 768455a3d4
2019-02-22 20:35:16 -08:00
Anton Hansson
17a4def424
Merge "Add more BoardConfig variables to stash list" am: 299ffb7870
...
am: 56a0405ec6
2019-02-22 20:34:31 -08:00
Logan Chien
e12bfc81b9
Merge "Refine lsdump_paths.txt dependencies" am: 7d35910451
...
am: a3146e8c0a
2019-02-22 20:33:49 -08:00
Sasha Smundak
dd3122dc48
Merge "Add a wrapper file for the vts_config module." am: f97ed91448
...
am: f097a2248c
2019-02-22 20:33:06 -08:00
Colin Cross
0ee78f3aa1
Merge "Get DEXPREOPT_BOOT_JARS_MODULES from Soong" am: 6128b1e8d6
...
am: 54ac6ed073
2019-02-22 20:31:28 -08:00
Tianjie Xu
061dfe08eb
Merge "Dump a copy of metadata file for full OTA" am: df5978803d
...
am: 407c972bfa
2019-02-22 20:30:41 -08:00
Colin Cross
c4114d9641
Merge "Update calls to dexpreopt_gen" am: 0450863eca
...
am: 39fb391e8f
2019-02-22 20:29:19 -08:00
Xin Li
1cc579adef
Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master
2019-02-23 00:39:21 +00:00
Dan Willemsen
ce54b9c8d8
Merge "Revert "First pass at creating PRODUCT_HOST_PACKAGES""
2019-02-22 22:03:32 +00:00
Dan Willemsen
086f8f002c
Revert "First pass at creating PRODUCT_HOST_PACKAGES"
...
This reverts commit 7218a21ed0
2019-02-22 22:02:23 +00:00
Dan Willemsen
5cd6dc5a40
Merge "First pass at creating PRODUCT_HOST_PACKAGES"
2019-02-22 20:24:36 +00:00
