Commit Graph

48062 Commits

Author SHA1 Message Date
Treehugger Robot 76f2628654 Merge "dynamic partitions: round partitions to BOARD_SUPER_PARTITION_ALIGNMENT" 2019-02-02 01:39:37 +00:00
Treehugger Robot f834600fb3 Merge changes I1772a55a,Ibd398d4f,If5476048,Ied201aad
* changes:
  Enable mainline checking for all GSI targets
  Change aosp_$arch.mk to inherit from gsi_common.mk
  Change Legacy GSI to inherit from gsi_common.mk
  Whilelist system/product_services in gsi_common.mk
2019-02-02 00:27:37 +00:00
SzuWei Lin 323be83a66 Enable mainline checking for all GSI targets
There are some makefile inherit from aosp_$arch*.mk. This patch
change to only enable mainline checking on excat GSI targets,
such as aosp_$arch or aosp_$arch_(a|ab), and does not apply on
the child targets.

This patch also add some more whitelist items to gsi_common.mk

Bug: 123613261
Test: aosp_arm64-userdebug build pass
Test: remove some whitelist items and aosp_arm64-userdebug build fail
Test: sdk_phone_arm64-eng build pass
Test: gsi_arm64-userdebug build pass
Change-Id: I1772a55ab823a0312b9f215f0d2c3b0c727c8e4b
2019-02-01 15:30:28 +08:00
SzuWei Lin ce1fdb2f55 Change aosp_$arch.mk to inherit from gsi_common.mk
The patch changes GSI (aosp_$arch) to inherit from gsi_common.mk
instead of aosp_base_telephony.mk.

The patch also clones the emulator_vendor.mk from emulator.mk to
include all vendor modules.

Bug: 119747870
Test: boot aosp_arm64-userdebug on a blueline device on master/P
Test: boot aosp_x86-userdebug on the emulator
Test: boot aosp_x86_64-userdebug on the emulator
Test: compare the out folder with/without the patch, only more content
Change-Id: Ibd398d4f93d2a964813e05ccd434975435d25adc
2019-02-01 11:29:02 +08:00
SzuWei Lin f6f5d8ad09 Change Legacy GSI to inherit from gsi_common.mk
The patch change Legacy GSI (aosp_$arch_(a|b)) to inherit from
gsi_common.mk instead of treble_common.mk

It does not inherit from gsi_common.mk directy. The patch adds
legacy_gsi_common.mk to extend gsi_common.mk, and all Legacy
GSI inherit from legcay_gsi_common.mk.

The patch also removed treble_common*.mk.

Bug: 119747870
Test: flash aosp_arm64_ab-userdebug on blueline P
Test: flash aosp_arm64_ab-userdebug on walleye O-MR1
Change-Id: If54760484cc0937719c1336f1a4caac8468d2009
2019-02-01 11:29:02 +08:00
SzuWei Lin 54ea4b763a Whilelist system/product_services in gsi_common.mk
GSI could include system/product_services to override the content
in product_services partition, so whitelist the folder.

Bug: 119747870
Test: build a build target has prodcut_services and
Test: inherit gsi_common.mk
Change-Id: Ied201aad88d75ef85258c24e8a2a4952b968ff3f
2019-02-01 11:29:02 +08:00
Mathieu Chartier 4bd3fe9565 Merge "Remove USER exclusion for dalvik.vm.dex2oat-resolve-startup-strings" 2019-01-31 21:23:27 +00:00
Treehugger Robot 61ae763ec4 Merge "Remove dependencies on hiddenapi files with UNSAFE_DISABLE_HIDDENAPI_FLAGS=true" 2019-01-31 19:25:59 +00: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 a734907705 Merge "Deprecate LOCAL_MODULE_TAGS := eng/debug" 2019-01-31 18:32:16 +00:00
Mathieu Chartier 42ce38236a Remove USER exclusion for dalvik.vm.dex2oat-resolve-startup-strings
Aims to have more consistency between user and userdebug builds.

Bug: 116059983
Test: make

Change-Id: I4f8bdbdd9c3983d04d956a4993d9de60f5f60664
2019-01-31 09:53:52 -08:00
Treehugger Robot 4f3f03c09b Merge "Count hotness in system server compiled code" 2019-01-31 17:19:38 +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
Calin Juravle fae75af005 Count hotness in system server compiled code
Bug: 123665033
Test: manual: build & look at system server profile
Change-Id: Ia155073ee6f94424f2c22035283f688a495fba8c
2019-01-31 00:00:34 -08:00
Rett Berg 9d1aab10f3 Merge "add pathmod to envsetup.sh for making finding paths to modules easier" 2019-01-31 00:39:29 +00:00
Treehugger Robot aa615a1b2d Merge "DAP: building system_other.img for retrofit devices" 2019-01-30 22:52:35 +00:00
Mathieu Chartier 8fdf4e0f5b Merge "Enable resolution of startup const-string for non user builds" 2019-01-30 22:40:03 +00: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
Rett Berg 78d1c93e12 add pathmod to envsetup.sh for making finding paths to modules easier
Change-Id: Ice1f2ff6d46a61bca5a4ddc1163af36c89947822
Test: gomod vsoc_lib && pwd
Test: pathmod vsoc_lib
Test: pathmod foobar  # get error message
Test: gomod foobar    # get error message, directory doesn't change
2019-01-30 12:47:13 -08:00
Treehugger Robot 7839861087 Merge "vndk: current: remove libpagemap" 2019-01-30 19:19:26 +00: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
Mathieu Chartier cf5a8b16ed Enable resolution of startup const-string for non user builds
Bug: 116059983
Bug: 111397239
Test: make
Change-Id: I82dec2041e7cb83897bd7ed7125631c39a4af85a
2019-01-30 17:14:00 +00: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
Treehugger Robot 59fa4ca993 Merge "Add gsi_common.mk" 2019-01-30 05:32:53 +00:00
Treehugger Robot 423be675eb Merge "Rename preferCodeIntegrity to useEmbeddedDex" 2019-01-30 05:07:22 +00:00
Treehugger Robot 246e728614 Merge "Use DEXPREOPT_BOOTCLASSPATH_DEX_FILES to build boot_profile_jars.zip" 2019-01-30 04:26:04 +00:00
Treehugger Robot 731de8903e Merge "Build soong odex files for mma" 2019-01-30 03:56:26 +00: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
Sandeep Patil 74e85fe723 vndk: current: remove libpagemap
Bug: 113035067
Test: lunch aosp_blueline-userdebug; m -j

Change-Id: Ie866eb9fc53ee81d3034520d560aa0ed7d7ba45a
Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-01-29 14:59:36 -08:00
Mark Salyzyn 1d8d3bef47 dynamic partitions: round partitions to BOARD_SUPER_PARTITION_ALIGNMENT
For the worst minimum_io_size for the BOM for the flash device on
the products, set BOARD_SUPER_PARTITION_ALIGNMENT so that we can
in advance get a summary from the build that the update may fail.

Test: build
Bug: 122328872
Change-Id: I95515e58e5308b7a1e637fc8c8791c0fc61e81f2
2019-01-29 14:50:10 -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 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
SzuWei Lin 97951719ae Add gsi_common.mk
gsi_common.mk is a new makefile file for GSI build targets.
It inherited the content from Mainline by mainline_system.mk.
Also it include other default GSI settings and try to covered
all contents from aosp_base_telephony.mk

It will be used to replace the treble_common*.mk. All
aosp_$arch*.mk will become to inherit from gsi_common.mk.

This patch also contains a new build target gsi_arm64,
which is used to test the gsi_common.mk purely.

Bug: 119747870
Test: compare the out system folder between gsi_arm64 and aosp_arm64
Test: also the gsi_arm64-userdebuge can boot on a Pixel device
Change-Id: I9a013f9407e0fe06b45011e36d5169b94f67148d
2019-01-29 18:00:04 +08:00
Anton Hansson 02d7d48d4a Merge "Allow merging product_services into /product" 2019-01-29 09:28:40 +00:00
Treehugger Robot d6b231faaa Merge "Enforce no unused HALs when product matrix exists." 2019-01-29 01:48:24 +00:00
Treehugger Robot 3a296fde5f Merge "base_vendor += dumpsys_vendor" 2019-01-29 01:46:08 +00: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
Treehugger Robot 68e2dc2086 Merge "releasetools: Really allow removing partitions" 2019-01-28 22:18:09 +00:00
Ruchi Kandoi fee423e64d Merge "add android.hardware.secure_element@1.1" 2019-01-28 21:49:55 +00: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