Commit Graph

49635 Commits

Author SHA1 Message Date
Dan Willemsen
c478ea3dac Fix m snod
Whenever we're not loading all makefiles, we shouldn't be checking that
all the host packages exist.

Test: m snod
Change-Id: If1f817d855cbe329b83caee9fdd68c2cce55f02b
2019-03-07 17:18:15 -08:00
Dan Willemsen
75720c81aa Merge changes from topic "HOST_PACKAGES"
am: 066da0c58b

Change-Id: I9600129b255f1ef16880a217aeeac60622aab571
2019-03-07 17:07:33 -08:00
Dan Willemsen
87d763b9f4 Reland "First pass at creating PRODUCT_HOST_PACKAGES"
am: 3d05a08a6f

Change-Id: Ifc134f514dbcfc28e33eb82b2a77514cc4af26b6
2019-03-07 17:06:23 -08:00
Dan Willemsen
066da0c58b Merge changes from topic "HOST_PACKAGES"
* changes:
  Build everything in PRODUCT_HOST_PACKAGES
  Reland "First pass at creating PRODUCT_HOST_PACKAGES"
2019-03-08 00:21:01 +00:00
Tri Vo
6a03c1677b Merge "recovery: install product_file_contexts and product_property_contexts"
am: 9f18c64d07

Change-Id: If303af03aed7453c4cacfba21b13debc2bd7dcff
2019-03-07 11:58:25 -08:00
Tao Bao
dff72247d8 Merge "releasetools: Include retrofit info into package metadata."
am: 28a11ef040

Change-Id: I76c8f757efea6bb2ce8d0dc084083e5c8f6f6bc6
2019-03-07 11:04:35 -08:00
Tri Vo
9f18c64d07 Merge "recovery: install product_file_contexts and product_property_contexts" 2019-03-07 18:32:48 +00:00
Tao Bao
28a11ef040 Merge "releasetools: Include retrofit info into package metadata." 2019-03-07 18:11:30 +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
Yifan Hong
8c2ec2f061 Merge "Remove logical partitions from ab_partitions.txt in retrofit package."
am: fa2e796ce2

Change-Id: I18cd55ca0fd440d0df97328695db425600ad1688
2019-03-06 17:29:07 -08:00
Treehugger Robot
fa2e796ce2 Merge "Remove logical partitions from ab_partitions.txt in retrofit package." 2019-03-07 01:06:42 +00:00
Tao Bao
393eeb4918 releasetools: Include retrofit info into package metadata.
Fixes: 126754990
Test: Generate retrofit and non-retrofit OTAs. Check the package
      metadata entry.
Test: python -m unittest test_ota_from_target_files
Change-Id: I076a013a6224a2ffea8e0b8581890b66f847f165
2019-03-06 16:19:11 -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
Yifan Hong
b433eba6a6 Remove logical partitions from ab_partitions.txt in retrofit package.
For retrofit updates:
ab_partitions -= dynamic_partition_list
ab_partitions += super_block_devices

For example,
if super_block_devices == ["system", "vendor", "odm"] and
   dynamic_partition_list == ["system", "vendor", "product"],
product partition needs to be removed from ab_partitions.txt
otherwise brillo_update_payload will generate a payload with
product partition in it.

Test: retrofit update that adds a partition
Fixes: 127425410

Change-Id: Id79a410cee3c611ac50d27f14282916aea34f938
2019-03-06 13:35:20 -08:00
Colin Cross
9c6a64ea64 Merge "Update manifest merger to use binary"
am: e34ff5ca5d

Change-Id: I0e10784282edb4394c192ffe5b177023d5d72832
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
Tao Bao
2173bc1cf2 Include charger.recovery for recovery.
It used to be installed to recovery with the rsync from normal root to
recovery root.

Bug: 114042635
Test: `m -j bootimage` with aosp_walleye-userdebug.
Change-Id: If3451f21018f271b1df83a31d4ece382e0dfebb9
2019-03-04 11:46:29 -08:00
Nicolas Geoffray
40ccefa404 Merge "Pass the --api-flags to appcompat explicitly."
am: 53cfd9275b

Change-Id: I1bb503a1140c6d3877280c6073710bd9b5ffb61a
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
cab4032f3c Merge "Add a placeholder EXTRA_OPTIONS to inject more tradefed options"
am: 20a50f75a3

Change-Id: Icf8f52e2aad12157daf3b967b6afa606dc7e0366
2019-03-01 17:00:15 -08:00
Julien Desprez
20a50f75a3 Merge "Add a placeholder EXTRA_OPTIONS to inject more tradefed options" 2019-03-02 00:44:54 +00:00
Martin Stjernholm
d8f1c11f32 Merge "Clean up libjdwp.so and possibly other dependencies that might have crept in between http://r.android.com/890494 and http://r.android.com/913898."
am: 9da3b4c6f3

Change-Id: I59c19aa34f8cf7befe160d72b258bfe40bba6586
2019-03-01 15:21:08 -08:00
Treehugger Robot
9da3b4c6f3 Merge "Clean up libjdwp.so and possibly other dependencies that might have crept in between http://r.android.com/890494 and http://r.android.com/913898." 2019-03-01 22:59:08 +00:00
Martin Stjernholm
6fd16926b1 Clean up libjdwp.so and possibly other dependencies that might have crept in
between http://r.android.com/890494 and http://r.android.com/913898.

(Repopulating libs from intermediates is quick, so not wasting effort trying
to be precise.)

Test: Don't have a suitably old build tree to test with.
Bug: 124498388
Change-Id: Ice35606e4c301d5b01837963137421f9d23a9733
2019-03-01 20:41:52 +00: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
9abd15f3c1 Merge "Build ODM manifests and fragments for each SKU."
am: 5a4696e460

Change-Id: I40c136830b1e0b433533c55499736a5ad979a039
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
393de8744d Merge "Move BoardConfig strip / READONLY marking"
am: e0ce6ca8a5

Change-Id: I469fe2d74ce5a89084bef4637b471afc4db1b8b4
2019-03-01 07:46:50 -08:00
Anton Hansson
0eca386c7e Merge "Move combo makefile parsing"
am: 451951c139

Change-Id: I9d7d4373abf5ebaa7d584f320433060aec8633e7
2019-03-01 07:42:26 -08:00
Colin Cross
fb770b4f84 Merge "Use flags from Soong for d8 and r8"
am: 5852c93585

Change-Id: Iae764b89ba7a248e91b829144fd0d19796b773ef
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
Martin Stjernholm
6dddea74a3 Merge "Remove libnpt from system again."
am: 1b9a0c8f7d

Change-Id: Id8facf72a22e7ed6fc717124341f64a8abcafecd
2019-02-28 18:44:07 -08:00
Treehugger Robot
1b9a0c8f7d Merge "Remove libnpt from system again." 2019-03-01 02:23:50 +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
04d20252f9 Merge "Make it an error to specify the wrong ARCH_VARIANT"
am: c651ef8529

Change-Id: I754ded4bfeb01e7c7be9034845fbb5fcb30f996d
2019-02-28 02:38:27 -08:00
Anton Hansson
5141484847 Merge "Move WITH_DEXPREOPT default value"
am: 67d3081d3f

Change-Id: I30bae8e8cd869ce564540565dec159b52ddc5d7e
2019-02-28 02:32:25 -08:00
Anton Hansson
3df97964e6 Merge "Modify INTERNAL_KERNEL_CMDLINE instead of BOARD_ variant"
am: 2507ce486d

Change-Id: Ia7757912af4bdeee6836df94619f6faa09bf8cc4
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
3f6e03334a Merge "Consolidate some BoardConfig variable checks"
am: d265f52005

Change-Id: I805488439c08649e03a977d4d1a77e9d94b92d67
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
Martin Stjernholm
616dc79043 Remove libnpt from system again.
http://r.android.com/914573 fixes libjdwp to look for it in the APEX.

Test: Flash and boot
Test: adb forward tcp:5555 jdwp:`adb shell pidof com.android.email` && jdb -attach localhost:5555
Test: atest CtsJdwpTestCases
Bug: 124498388
Change-Id: Idf380660a21c88969e42d6a03a6b50fd2baa4c17
2019-02-27 20:51:56 +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