Commit Graph

18443 Commits

Author SHA1 Message Date
Yifan Hong fe4f46caca Merge "Add kernel info to compatibility.zip" am: 5cc9230914
am: b35937ca55

Change-Id: I396a27bddf635afba797816688bb31a6558d6881
2019-01-31 11:25:04 -08:00
Colin Cross 0410f34bff Merge "Fix linker_asan[64] apex bootstrap build error" am: ca8ec381a0
am: d880f0ba95

Change-Id: I0fd96ca927aa65363f0492294793f5a2a072a68a
2019-01-31 11:21:00 -08:00
Yifan Hong 5cc9230914 Merge "Add kernel info to compatibility.zip" 2019-01-31 19:06:19 +00:00
Colin Cross ca8ec381a0 Merge "Fix linker_asan[64] apex bootstrap build error" 2019-01-31 19:05:59 +00:00
Dan Willemsen a724cbd91a Merge "Deprecate LOCAL_MODULE_TAGS := eng/debug" am: a734907705
am: a3f5b09c42

Change-Id: I6a02ea8aaf44a435973361905d30e691e42c039b
2019-01-31 10:55:46 -08:00
Dan Willemsen a734907705 Merge "Deprecate LOCAL_MODULE_TAGS := eng/debug" 2019-01-31 18:32:16 +00:00
Logan Chien c6d2cf86d1 Fix linker_asan[64] apex bootstrap build error
This commit fixes `linker_asan[64]` apex bootstrap build errors.
Without this change, `make -j SANITIZE_TARGET=address` results in:

  FAILED: ninja: 'out/target/product/walleye/system/bin/linker_asan64',
  needed by 'out/target/product/walleye/system/bin/app_process64',
  missing and no known rule to make it

Test: lunch aosp_walleye-userdebug && make SANITIZE_TARGET=address
Change-Id: I980a36499cd327db307321fc8e4548925e7d56bf
2019-01-31 17:07:50 +08:00
Bowgo Tsai 3ea7740946 Merge "DAP: building system_other.img for retrofit devices" am: aa615a1b2d
am: 2b51826211

Change-Id: I9217850fa149493ddaf535b77ac7dc87b12b318e
2019-01-30 15:02:58 -08:00
Treehugger Robot aa615a1b2d Merge "DAP: building system_other.img for retrofit devices" 2019-01-30 22:52:35 +00:00
Anton Hansson cc41430a8b Merge "Fix RRO when LOCAL_EXPORT_PACKAGE_RESOURCES is unset" am: bb83cc2689
am: 65adcb9e7f

Change-Id: Iffcf21cec34011e5ae971198157d57a6e78c95e4
2019-01-30 14:49:46 -08:00
Anton Hansson 495c981604 Merge "Exempt some RROs from building against SDK" am: 9a50c1f438
am: 5a4cda4f2b

Change-Id: I64047baee18d32c343ae9e48ffb8e3c262078af2
2019-01-30 14:48:52 -08:00
Anton Hansson bb83cc2689 Merge "Fix RRO when LOCAL_EXPORT_PACKAGE_RESOURCES is unset" 2019-01-30 22:19:25 +00:00
Anton Hansson 9a50c1f438 Merge "Exempt some RROs from building against SDK" 2019-01-30 22:17:25 +00:00
Yifan Hong 770ab053b0 Add kernel info to compatibility.zip
Add kernel configs / version to verified_assembled_vendor_manifest.xml
so that the kernel of the incoming package can be checked against
the framework. Previously, the running kernel was used instead.

Bug: 111125947
Test: test_extract_kernel
Test: manual OTA on Pixel 3 from build:
      Android P (kernel version 4.9.96)
      to ToT build:
      device kernel version = (manually modified) framework requirement = latest,
      PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS = true

Change-Id: Id524a58e94bdb6bba348ca461c9d33614ce451a9
2019-01-30 13:28:03 -08:00
Colin Cross 55b00509e9 Merge changes I0bee792d,I2b7c3c8f am: badde7ced7
am: 8b6c0d1df0

Change-Id: I58c5aedbc7aae27f24e1f87f4df75fee8eaebb5b
2019-01-30 10:47:01 -08:00
Treehugger Robot badde7ced7 Merge changes I0bee792d,I2b7c3c8f
* changes:
  Build aar files for m <module name>
  Add LOCAL_ADDITIONAL_CHECKED_MODULE
2019-01-30 18:26:24 +00:00
Jiyong Park f7b1c4d58e Merge "Reland "Add $(PRODUCT_OUT)/apex to the artifact path whitelist"" am: ea976a2780
am: a3cf81641f

Change-Id: I4054b1d8332da889e55ff1766dbde2e31ca436cd
2019-01-30 09:25:39 -08:00
Treehugger Robot ea976a2780 Merge "Reland "Add $(PRODUCT_OUT)/apex to the artifact path whitelist"" 2019-01-30 16:57:11 +00:00
Colin Cross 89d3d2ae3b Fix RRO when LOCAL_EXPORT_PACKAGE_RESOURCES is unset
If LOCAL_EXPORT_PACKAGE_RESOURCES is unset then
append_enforce_rro_sources was inserting a blank entry into
the 4th.  When converting the || separator back to space that
resulted in a two sequential spaces, which is treated as a
single word separator, causing the 5th field to be treated
as the 4th field.

Put "false" into the 4th field in soong_app_prebuilt.mk to match
package_internal.mk.

Bug: 123510624
Test: m SystemUIGoogle
Change-Id: I794c413e33df2020d0dc43379cfb017e7e09baa1
2019-01-30 16:09:41 +00:00
Victor Hsieh c9d66874f0 Merge "Rename preferCodeIntegrity to useEmbeddedDex" am: 423be675eb
am: a042ad0670

Change-Id: I7db9d21a8d8056c3b278e8ee272c97780b8fb194
2019-01-29 21:37:38 -08:00
Treehugger Robot 423be675eb Merge "Rename preferCodeIntegrity to useEmbeddedDex" 2019-01-30 05:07:22 +00:00
Calin Juravle e77717f25d Merge "Use DEXPREOPT_BOOTCLASSPATH_DEX_FILES to build boot_profile_jars.zip" am: 246e728614
am: 4f819cda1b

Change-Id: I712aac26d221d578477eb6d37f73894fb3dd4032
2019-01-29 20:41:10 -08:00
Treehugger Robot 246e728614 Merge "Use DEXPREOPT_BOOTCLASSPATH_DEX_FILES to build boot_profile_jars.zip" 2019-01-30 04:26:04 +00:00
Colin Cross 8f77927d09 Merge "Build soong odex files for mma" am: 731de8903e
am: 140d2e9ca7

Change-Id: I7ee5238691676431d2e3f66959544476badb6323
2019-01-29 20:15:03 -08:00
Jiyong Park 1ba4c7f11e Reland "Add $(PRODUCT_OUT)/apex to the artifact path whitelist"
This reverts commit 4cf7cde9aa.

Bug: 120846816
Test: build/soong/build_test.bash -dist -products mainline_system_arm64
Test: lunch aosp_cf_x86_pasan-userdebug; m && SANITIZE_TARGET=address m

Change-Id: I6fbf23dcef450da17fafafa78def3816792d83c8
2019-01-30 12:32:49 +09:00
Bowgo Tsai 867ab6606e DAP: building system_other.img for retrofit devices
For dynamic partitions in retrofit devices, system partition will be
a logical partition but system_other is not. However, current
build system use the same settings (logical) for both system.img and
system_other.img, leading AVB unable to locate the footer from the end
of system_other partition.

This commit support building system_other.img with correct partition size
while building system.img as a dynamic image.

Bug: 123506156
Test: check there is "system_other_size=2952790016" in file
      $OUT/obj/PACKAGING/system_other_intermediates/system_other_image_info.txt
Test: build system_other.img, then
      `simg2img $OUT/system_other.img system_other.img.raw`, checks the
      raw image size.

Change-Id: I748320a7770c694d06f06f4a35bfceb622849aa8
2019-01-30 09:58:07 +08:00
Calin Juravle 9e1fb1b3bd Use DEXPREOPT_BOOTCLASSPATH_DEX_FILES to build boot_profile_jars.zip
The core libraries are no longer put in /system/framework. Replace the
system path with the dexpreopt input path.

Test: launch taimen_nopreload-userdebug; m
Bug: 123313750
Change-Id: I6232c36d39fb818a302cb4b6cb61e91b44b28da1
2019-01-29 16:43:21 -08:00
Colin Cross cd6622e832 Build soong odex files for mma
Add the LOCAL_SOONG_BUILD_INSTALLED files as dependencies of
$(my_all_targets) instead of $(my_register_name) so they are built
for mma and mmma as well as m <module name>.

Fixes: 123262430
Test: mmma packages/apps/Gallery2
Change-Id: I0d55beccf9385144c190ea4bf099fb267ac6db1c
2019-01-30 00:35:34 +00:00
Colin Cross bd2287b846 Build aar files for m <module name>
Test: m SystemUI-core
Change-Id: I0bee792d1af80abb3e74c278db488bd668bd1fb4
2019-01-29 15:12:17 -08:00
Colin Cross 0162cc8bea Add LOCAL_ADDITIONAL_CHECKED_MODULE
Adding an intermediate file to LOCAL_ADDITIONAL_CHECKED_MODULE will
cause the file to be built for m <module name>, mma, or m checkbuild.

Test: m checkbuild
Change-Id: I2b7c3c8f01960ce2f9176c8a2108f759fd8fc704
2019-01-29 15:04:39 -08:00
Victor Hsieh 06769c7efb Rename preferCodeIntegrity to useEmbeddedDex
Test: build and run testing apps
Bug: 112037137
Change-Id: Ie8cd8e141df097095310ecc57b6460308210dea5
2019-01-29 13:03:22 -08:00
Tom Cherry d81af0d11b Merge "Remove ro.expect.recovery_id" am: c683233b64
am: 2432b8116a

Change-Id: I42316425c3466278ff22b2e687c6fa45980cece1
2019-01-29 09:27:09 -08:00
Tom Cherry c683233b64 Merge "Remove ro.expect.recovery_id" 2019-01-29 17:07:51 +00:00
Anton Hansson 038177ba55 Exempt some RROs from building against SDK
If an RRO is depending on the source module to import its resources,
this trips up the link check because the source module may not be
building against the SDK. Exempt these RROs from the rule.

Bug: 123510624
Test: m
Change-Id: Ie0e05ce6d31dd3a0eafb14ace426da2bc15fb740
2019-01-29 15:21:25 +00:00
Anton Hansson 756590ca12 Merge "Allow merging product_services into /product" am: 02d7d48d4a
am: 78d8e9c3da

Change-Id: I8603cde7952e2a54b1031369538db5dbebd6604c
2019-01-29 01:49:46 -08:00
Anton Hansson 02d7d48d4a Merge "Allow merging product_services into /product" 2019-01-29 09:28:40 +00:00
Yifan Hong 03904bd06a Merge "Enforce no unused HALs when product matrix exists." am: d6b231faaa
am: 9e4fa5a41b

Change-Id: I04f30a2c49cdc9238b8c5d776b4eaf367169e47b
2019-01-28 23:19:52 -08:00
Yifan Hong ab1ec4dbe3 Enforce no unused HALs when product matrix exists.
Also, remove old TODO message because it cannot be fixed.

Bug: 120600021
Test: builds
Test: remove entry from product matrix, build fails.

Change-Id: I9a6e954a1003aa4ad1bbca184ad7041ffad6b99b
2019-01-28 15:09:54 -08:00
Anton Hansson d26e4eeec8 Allow merging product_services into /product
Allow devices to specify TARGET_COPY_OUT_PRODUCT_SERVICES := product,
which in effect treats all product_services modules the same as product
modules.

Do not generate license and build props for product_services when
this settings is enabled.

Bug: 113098451
Test: boot downstream product
Change-Id: Id51230b969900bebcf19d0138dfd6187dfce25b1
2019-01-28 21:24:59 +00:00
Tom Cherry 56ff89a90a Remove ro.expect.recovery_id
This is not used by anyone and the other half of the code to compare
against it is already functionally dead, so remove this.

Test: build
Change-Id: I44ed087cb7735bbc23e30b6c310c80eb3b7b6488
2019-01-28 10:56:37 -08:00
Anton Hansson 7c1890f536 Merge "Auto-include device_manifest.xml when necessary" am: 096b88bf90
am: 1cff5df789

Change-Id: I919a87d53824a7af5ddcba6253d657d149f9a35f
2019-01-28 01:41:29 -08:00
Anton Hansson 096b88bf90 Merge "Auto-include device_manifest.xml when necessary" 2019-01-28 09:18:34 +00:00
Colin Cross 70323e8e21 Merge "Remove obsolete proguard flags" am: 8a508cbc0b
am: 80e86c8ff8

Change-Id: I1becd4c650be4f19a0286b23dd114e29b5fec84d
2019-01-25 18:44:41 -08:00
Colin Cross 8a508cbc0b Merge "Remove obsolete proguard flags" 2019-01-26 02:30:55 +00:00
Joe Onorato f1847c0a18 Merge "When using inherit-package for a test, also allow specifying a new test suite." am: c51c523b88
am: ac00ab680e

Change-Id: I13bc3b38e4f359515b1e70c45c49f31ac3ec5fe2
2019-01-25 17:16:36 -08:00
Treehugger Robot c51c523b88 Merge "When using inherit-package for a test, also allow specifying a new test suite." 2019-01-26 00:57:14 +00:00
Colin Cross 2ac9c6219a Remove obsolete proguard flags
R8 now warns:
Warning in ./build/make/core/proguard_basic_keeps.flags:
  Ignoring option: -optimizations

Remove the flags, they are not used by R8.

Fixes: 123401079
Test: m checkbuild
Change-Id: I8b0c558be8bcf943652dddb71802ddc145ae42c1
2019-01-25 21:30:13 +00:00
Nicolas Geoffray 6c10f21f5a Merge "Revert "Revert "Differentiate between runtime apex jars and framework jars.""" am: 1174b010f6
am: cdd640e40e

Change-Id: Ifcc2c79b01d4ab747be890f89f80105aa283c16f
2019-01-25 11:21:58 -08:00
Nicolas Geoffray 1174b010f6 Merge "Revert "Revert "Differentiate between runtime apex jars and framework jars.""" 2019-01-25 19:02:13 +00:00
Anton Hansson ff7f7e61f8 Merge "Fix typo of PRODUCT_BUILD_PRODUCT_SERVICES_IMAGE" am: 18977ff3a9
am: 7004e33836

Change-Id: Ie56dfc190475f6a3e9129ce925dc2c9648ea1e8b
2019-01-25 10:33:48 -08:00