Commit Graph

45418 Commits

Author SHA1 Message Date
Mathieu Chartier f604a3d1cf Merge "Allow multiple profiles to be added as part of boot.prof"
am: a3010c60fe

Change-Id: I7a0c4770e1cd8fa94971bc3982f2b14cf1a1c553
2018-07-06 16:14:53 -07:00
Mathieu Chartier a3010c60fe Merge "Allow multiple profiles to be added as part of boot.prof" 2018-07-06 23:03:23 +00:00
Tao Bao a24f711bf3 releasetools: Remove three obsolete functions from EdifyGenerator.
Namely MakeTemporary, Verify and FileCheck. They were once used for
file-based OTA that has been deprecated.

Test: Check that there's no active user, including device-specific
      releasetools script.
Change-Id: Ic73054d73271ad91e860b34b2ba156361c58bc1a
2018-07-06 14:21:26 -07:00
Tao Bao a85cb404cd Merge "releasetools: Add dict-like setter to BuildInfo."
am: ee36b42beb

Change-Id: I97039b14a1664d5cddd2cf44de600686bbf3f26d
2018-07-06 14:05:23 -07:00
Tao Bao ee36b42beb Merge "releasetools: Add dict-like setter to BuildInfo." 2018-07-06 20:56:53 +00:00
Steven Moreland 385442d399 aidl: -ninja -> --ninja
Bug: 110967839
Test: AIDL's runtests.sh
Change-Id: I785d39846a477c7edb91db477a0dfa046d823cbf
2018-07-06 11:35:09 -07:00
Tao Bao 667c7534ed releasetools: Add dict-like setter to BuildInfo.
BuildInfo already has dict-like getters. This CL adds the matching
setter method to keep it backward compatible with device-specific
scripts that expect a dict.

It also adds items() method that allows iterating the items.

Bug: 111087332
Test: python -m unittest test_ota_from_target_files.BuildInfoTest
Test: Generate an incremental OTA that sets info_dict in device-specific
      releasetools script.
Change-Id: Idd033f98a9186740f9da1a300d4c2bdddd9c1345
2018-07-06 10:15:13 -07:00
Isaac Chen 9af10a31bf Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch
GSI Pi (for newly launched devices) need to enable this to pass
VtsTrebleSysProp.

Bug: 79395858
Test: Built aosp_{arm,arm64,x86,x86_64}. Check system/etc/prop.default
    and found "ro.actionable_compatible_property.enabled=true".
    aosp_x86(_64) could boot to home screen.

Change-Id: I04a4ff7c5feee7671d727c04c9d9657b63ec0912
Merged-In: I04a4ff7c5feee7671d727c04c9d9657b63ec0912
2018-07-06 13:41:08 +08:00
SzuWei Lin fa420b40c5 Add USE_XML_AUDIO_POLICY_CONF to GSI
USE_XML_AUDIO_POLICY_CONF is must for Treble device, so it is
also must on GSI. The settings is missed when creating GSI
aosp_$arch, add it back by this patch.

Bug: 110988359
Bug: 111053290
Test: build aosp_arm64 and build pass
Change-Id: I95f096e58350233fdcc8de115cc1691360070445
2018-07-06 13:22:35 +08:00
Isaac Chen ec61443226 [automerger skipped] Merge "Refactor BoardConfig.mk for emulator products"
am: 87399730de  -s ours

Change-Id: I96c43c1140a80e687a47f51692d943ba1abc5469
2018-07-05 19:18:13 -07:00
Isaac Chen 87399730de Merge "Refactor BoardConfig.mk for emulator products" 2018-07-06 02:08:35 +00:00
Anton Hansson e5a5f00b9e Merge "Add documentation for module resolution."
am: ce0d4aa328

Change-Id: I85aa55b9985e91001e56088579a376f46d9d03e5
2018-07-05 09:43:36 -07:00
Anton Hansson ce0d4aa328 Merge "Add documentation for module resolution." 2018-07-05 16:38:31 +00:00
Anton Hansson 0ba5380361 [automerger skipped] Merge "Remove non-existing packages from common mks."
am: c8cd56fcff  -s ours

Change-Id: I6e671cf3f4f4a612da7e9a655f0fb8c52cb0ab14
2018-07-05 09:32:36 -07:00
Anton Hansson c8cd56fcff Merge "Remove non-existing packages from common mks." 2018-07-05 16:21:28 +00:00
Anton Hansson 2dee452c92 Merge "Remove non-existing packages from common mks." into stage-aosp-master 2018-07-05 15:52:17 +00:00
Anton Hansson eb3358cfa7 Add documentation for module resolution.
I found this in the CL description of
I5fda1a77f58814097b10b5ad2743ee25adfaecc4, and modified it slightly.

Bug: 111154853
Test: No
Change-Id: I984ac1a9521357af6b54340939dcde36988fc634
2018-07-05 16:31:33 +01:00
Anton Hansson 159acd4e0a Remove non-existing packages from common mks.
These were found by comparing PRODUCT_PACKAGES to $(ALL_MODULES). It
will be made an error for the core makefiles to depend on non-existing
modules soon.

Bug: 7456955
Bug: 80410283
Test: make
Test: diff various products before and after
Change-Id: I5d8af175a48172e63926e68f39daad4508f37ccb
Merged-In: I5d8af175a48172e63926e68f39daad4508f37ccb
2018-07-05 13:39:27 +01:00
Anton Hansson 06a23f8414 Remove non-existing packages from common mks.
These were found by comparing PRODUCT_PACKAGES to $(ALL_MODULES). It
will be made an error for the core makefiles to depend on non-existing
modules soon.

Bug: 7456955
Bug: 80410283
Test: make
Test: diff various products before and after
Change-Id: I5d8af175a48172e63926e68f39daad4508f37ccb
2018-07-05 13:38:26 +01:00
Dario Freni 37333682da Merge "Install /system/product apps odex in system-other."
am: 12e0e51116

Change-Id: I557c83122eb3d0bc894e479d645d353630075bb8
2018-07-05 05:30:18 -07:00
Dario Freni 12e0e51116 Merge "Install /system/product apps odex in system-other." 2018-07-05 12:11:50 +00:00
Isaac Chen 55e1d01f92 Refactor BoardConfig.mk for emulator products
The majority of the contents in BoardConfig.mk of emulator products
are the same. The common part is factored out as EmuConfig.mk so it's
easier to maintain these closely related products going forward.

Bug: 80117040
Test: Following products have been built and booted to homescreen:
  $ lunch aosp_x86-userdebug; m -j; emulator
  $ lunch aosp_x86_64-userdebug; m -j; emulator

Change-Id: I5392e0e88865d4908906a67c29939c23af84baf0
Merged-In: I5392e0e88865d4908906a67c29939c23af84baf0
(cherry picked from commit 510b76d8ff)
2018-07-05 18:47:15 +08:00
Anton Hansson 7789352e0b Merge "Remove libdownmix from core_minimal." into stage-aosp-master 2018-07-05 08:18:13 +00:00
Shibin George 9dd9e680b9 Allow multiple profiles to be added as part of boot.prof
Extend PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION such that
multiple text-based profiles can be fed to profman to be included
in boot.prof

BUG: 70292748
Test: profman with --dump-only option shows that additional
      text-based profiles are also being read if they have
      been added to PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION

Change-Id: I8a6437a323e43b61612c67038abdde200607c513
2018-07-04 18:05:07 +00:00
TreeHugger Robot c9ff0edb20 Merge "Refactor BoardConfig.mk for emulator products" into stage-aosp-master 2018-07-04 17:34:28 +00:00
Dario Freni aa45068cc7 Install /system/product apps odex in system-other.
This will cause odex/vdex files for apps installed under
/system/product/{priv-,}app to be installed in system-other image, under
/system/product/{priv-,}app as well.

Test: m on marlin-userdebug target, analyzed
installed-files{,-system-other}.txt
Bug: 110072687

Change-Id: I63406f91acc3de4b4f142767e28d45308706c7da
2018-07-04 16:28:18 +01:00
Anton Hansson 27854eadc7 Remove libdownmix from core_minimal.
It's in base_vendor.mk already, so it's redundant.

Test: make
Bug: 80410283
Change-Id: I7986eebc5071a7680f466fc5e61290d06f7f7647
2018-07-04 14:30:51 +01:00
David Brazdil a94e4ca2c6 Make classes.jar the output of uninstallable Soong Java modules
The soong_java_prebuilt.mk file used to assume that if a Soong module
defines a dex jar, it is the output of the module and the module is
installable. This may now not be true if the module uses 'compile_dex'
to define a secondary build rule for a dex jar. If the module is not
installable (LOCAL_UNINSTALLABLE_MODULE=true), do not attempt to preopt
and copy classes.jar to the modules output destination.

Bug: 79409988
Test: on related CL
Change-Id: Ica958ac793e09a0e52125448b44e7cd36e7f35d5
2018-07-03 17:10:54 +01:00
Anton Hansson ffba8f91a7 [automerger skipped] Merge "Include partition-split selinux_policy modules."
am: 8c01b71e2d  -s ours

Change-Id: Ic8de1c980b0889475925cb028509e58c1197e58d
2018-07-03 09:09:30 -07:00
Anton Hansson 8c01b71e2d Merge "Include partition-split selinux_policy modules." 2018-07-03 15:59:21 +00:00
Anton Hansson 099b21e815 Merge "Include partition-split selinux_policy modules." into stage-aosp-master 2018-07-03 14:56:49 +00:00
Anton Hansson 52a23cfbb3 Move packages from base_system to base_vendor.
These install on the vendor partition. Clean up the whitelist.

Bug: 80410283
Test: lunch mainline_arm64; m nothing

Change-Id: I45df64e1fa060ea98534351140678589afe2e340
Merged-In: I45df64e1fa060ea98534351140678589afe2e340
2018-07-03 12:42:21 +01:00
Anton Hansson 8999411ab1 Move packages from base_system to base_vendor.
These install on the vendor partition. Clean up the whitelist.

Bug: 80410283
Test: lunch mainline_arm64; m nothing

Change-Id: I45df64e1fa060ea98534351140678589afe2e340
2018-07-03 12:37:53 +01:00
Isaac Chen 510b76d8ff Refactor BoardConfig.mk for emulator products
The majority of the contents in BoardConfig.mk of emulator products
are the same. The common part is factored out as EmuConfig.mk so it's
easier to maintain these closely related products going forward.

Bug: 80117040
Test: Following products have been built and booted to homescreen:
  $ lunch aosp_x86-userdebug; m -j; emulator
  $ lunch aosp_x86_64-userdebug; m -j; emulator

Change-Id: I5392e0e88865d4908906a67c29939c23af84baf0
2018-07-03 09:58:59 +00:00
Anton Hansson b657bb29a5 Merge "Include root in mainline_system artifact claim."
am: a9966c7c60

Change-Id: I3fb41d46c5a33776ae0e6ae469e68da5c115e750
2018-07-02 09:35:18 -07:00
Anton Hansson a9966c7c60 Merge "Include root in mainline_system artifact claim." 2018-07-02 16:20:15 +00:00
Anton Hansson 56ce36f1b2 Include partition-split selinux_policy modules.
The selinux_policy module has been split in two, so that the system
artifacts can be included separately. Also remove associated whitelist
entries.

Bug: 80410283
Test: for t in eng userdebug user; do lunch mainline_arm64-${t}; m nothing; done
Change-Id: Id704c907b1ed31ae49697d33f075c013bc3dfc8c
2018-07-02 17:05:09 +01:00
Anton Hansson 173b5e75db Include root in mainline_system artifact claim.
With PRODUCT_SHIPPING_API_LEVEL >= 28, system-as-root is implied.
Remove redundant whitelist entries.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Ia18ef42525a3abb33842e939c389530ed299aafe
2018-07-02 15:01:35 +01:00
Anton Hansson ce5eb452be Include partition-split selinux_policy modules.
The selinux_policy module has been split in two, so that the system
artifacts can be included separately. Also remove associated whitelist
entries.

Bug: 80410283
Test: for t in eng userdebug user; do lunch mainline_arm64-${t}; m nothing; done
Change-Id: Id704c907b1ed31ae49697d33f075c013bc3dfc8c
Merged-In: Id704c907b1ed31ae49697d33f075c013bc3dfc8c
2018-07-02 14:36:28 +01:00
David Brazdil afb4d4cf8c Merge "Fix unzip on sdk_mac build"
am: 2986542f65

Change-Id: I422250d37866c56fed294a288bb1b7a8084372e8
2018-07-02 06:20:16 -07:00
David Brazdil 2986542f65 Merge "Fix unzip on sdk_mac build" 2018-07-02 13:10:07 +00:00
Anton Hansson 7a3e686ff5 [automerger skipped] Merge "Enable /cache mount point"
am: 7117311323  -s ours

Change-Id: I4d00da29144f8be6c0ca12371668f11302fab02e
2018-07-02 03:29:05 -07:00
David Brazdil c06f48a21d Fix unzip on sdk_mac build
Recent CL added a flag to an unzip command which does not restore
the timestamps of extracted files. This is necessary because the
extracted files are the output of the rule and thus the timestamp
must be newer than the timestamp of the inputs.

Unfortunately, the sdk_mac build has an old version of UnZip (5.52
vs 6.0) which does not support the flag. Replace it with find|touch.

Test: m
Change-Id: Ib1f218af4547a1d604b46e68b6ef50d45cb91ee9
2018-07-02 11:19:53 +01:00
Anton Hansson 7117311323 Merge "Enable /cache mount point" 2018-07-02 10:16:36 +00:00
Bowgo Tsai 631900e6ce Enable /cache mount point
Non-A/B devices using AOSP OTA flow will mount /cache in the
fstab file. Without setting BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE,
/cache will be a symlink to /data/cache which introduces the
failure of `mount_all /vendor/etc/fstab.{ro.hardware}`. This is
because all devices laucned in P need to switch to "system-as-root".

This CL sets board config to create /cache directory in rootfs
(system-as-root GSI image). Note that A/B devices doesn't mount
or use /cache so leaving an empty /cache in rootfs has no harm.

Bug: 78485405
Test: Boot GSI on walleye
Change-Id: Ic260d2917cc64c9497f5f60ea11303e953e80efd
Merged-In: Ic260d2917cc64c9497f5f60ea11303e953e80efd
2018-06-29 14:23:25 +01:00
Anton Hansson 305da98dcd [automerger skipped] Merge "Fix broken mainline_arm64."
am: 3613193b31  -s ours

Change-Id: I01cfd143440cd16599be67588a6aaac2a9a1e478
2018-06-29 05:12:04 -07:00
Anton Hansson 3613193b31 Merge "Fix broken mainline_arm64." 2018-06-29 12:04:26 +00:00
Anton Hansson b2aa1bcc5d Merge "Fix mainline_arm64." into stage-aosp-master 2018-06-29 12:03:32 +00:00
David Brazdil dfd096870d Merge "Refactor hiddenapi rules to share common code"
am: 9b53066762

Change-Id: I2fc45e8d861aff3a2e4ab5ca6ccf1ba44bb29c6c
2018-06-29 04:40:17 -07:00
David Brazdil 9b53066762 Merge "Refactor hiddenapi rules to share common code" 2018-06-29 11:33:09 +00:00