Commit Graph

44502 Commits

Author SHA1 Message Date
Jiyong Park
43c6a65706 Removed obsolete comment on PLATFORM_SYSTEMSDK_MIN_VERSION
The min version has been set.

Bug: 78023556
Test: no need
Change-Id: I12f816dfb9be7e9e945a68540f4efcfcc32b7cc2
2018-04-27 14:26:53 +09:00
Calin Juravle
60216615f4 Pass --dex-location when processing prebuilt profiles
The apk name does not match the install location at the stage we are
processing profiles. This causes the wrong profile key to be used in the
final profile which may generate an empty app image.

Test: m; flash, dumpsys dexopt and check for speed-profile
      check that the app image is not empty
Bug: 78515726

Change-Id: Ic5d71296583be71d96f0e7a2dd59753f1d23c350
2018-04-26 18:54:21 -07:00
Colin Cross
e1c494b3aa Merge "Set PLATFORM_SYSTEMSDK_MIN_VERSION := 28" into pi-dev
am: 026ac8f240

Change-Id: Iafb7acc932ff80924611df64f61acf5845662708
2018-04-26 15:16:34 -07:00
Colin Cross
026ac8f240 Merge "Set PLATFORM_SYSTEMSDK_MIN_VERSION := 28" into pi-dev 2018-04-26 21:44:13 +00:00
Bryan Henry
f130a239a1 Write combined bpt definition directly into META/partition-table.bpt
...instead of copying from IMAGES/partition-table.bpt during
sign_target_files_apks. This addresses a comment on go/oag/665565, but
is done as a separate change so that it can be cherry-picked later (or
not at all) to downstream branches to avoid breaking signing of existing
target-files zips.

Bug: 72837107
Test: Local sign_target_files_apks run of locally built target-files
Change-Id: Id14c859eefe075fc56b15869f2f21c570eb07e65
2018-04-26 12:43:27 -07:00
Bryan Henry
2a40cc6996 Support regenerating partition table with bpttool in sign_target_files_apks
For Android Things targets (or any other target which has
BOARD_BPT_INPUT_FILES defined), add_img_to_target_files will generate a
partition-table.img using bpttool. It also adds the final combined .bpt
definition file into target-files in IMAGES/partition-table.bpt.

When we're signing using sign_target_files_apks, add_img_to_target_files
needs to regenerate the partition table, but META/misc_info.txt still
contains the original list of bpt input files from the build that aren't
available. This change extracts the final bpt from the input
target-files, adds it to META/ in the output target-files, and then
updates the board_bpt_input_files property to point to it.

Bug: 72837107
Test: Local sign_target_files_apks run of locally built target-files
Change-Id: Id79125208f31c78b1ac2079172f9c91a9203849b
2018-04-26 12:42:59 -07:00
Bryan Henry
69d3feb23a Don't suppress stderr for 'avbtool make_vbmeta_image'
Output is useful for debugging.

Bug: 72837107
Test: Local sign_target_files_apks run of locally built target-files
Change-Id: I5c27fcc86fa3a51080e0502eb8f5f01a40b033c3
2018-04-26 12:42:40 -07:00
Bryan Henry
97f21ac01c Include default Android Things AVB keys in otatools.zip
Android Things has an extension on AVB and thus uses different test
keys, along with a public key metadata file. See external/avb/README.md.

Bug: 72837107
Test: Local sign_target_files_apks run of locally built target-files
Change-Id: I769e09a971b9b6b2c9cb0f3272f756b1857eb286
2018-04-26 12:42:34 -07:00
Colin Cross
88f3946e0e Set PLATFORM_SYSTEMSDK_MIN_VERSION := 28
In the temporary P-Finalization state, where PLATFORM_SDK_VERSION has
been incremented to 28 but PLATFORM_VERSION_CODENAME.PPR1 := P instead
of REL, PLATFORM_SYSTEMSDK_VERSIONS is still only P.  Set
PLATFORM_SYSTEMSDK_MIN_VERSION := 28 so that PLATFORM_SYSTEMSDK_VERSIONS
is 28 P.  Once PLATFORM_VERSION_CODENAME.PPR1 := REL it will become
just 28.

Bug: 78023556
Test: print PLATFORM_SYSTEMSDK_VERSIONS
Change-Id: I72cbef7bb7c84e6fd6fe4602021bb72d759d1b5e
2018-04-26 11:44:38 -07:00
SzuWei Lin
3fc49fede8 Create system.prop for GSI Pi
Properties for GSI Pi are not exactly the same as those for legacy GSI.
Create a new gsi_system.prop for GSI Pi to avoid reusing legacy
treble_system.prop used by legacy GSI (aosp_$arch_a(b) products).

Bug: 78605339
Test: build and observe the system/build.prop
Change-Id: I435e33558e244009af9a91a97580fd56591ff6f3
2018-04-26 08:55:43 +00:00
Max Bires
a1749987f0 Adding VENDOR_SECURITY_PATCH to vendor partition build.prop
This will add ro.vendor.build.security_patch to /vendor/build.prop on
device

Bug: 76428542
Test: ro.vendor.build.security_patch entry shows up under
/vendor/build.prop

Change-Id: I4f783e996cb425a49c2b12ae4f364e12c6ca7784
Merged-In: I4f783e996cb425a49c2b12ae4f364e12c6ca7784
(cherry picked from commit 56d444b98f)
2018-04-26 01:36:03 +00:00
Calin Juravle
e0ed7ef8cb Fix speed-profile compilation for prebuilds
am: 7d701355e9

Change-Id: I07ebc51cac2183f4991d9e58ba07ff542e3a3e0b
2018-04-25 17:39:15 -07:00
Logan Chien
bb62e1817b Merge "Add .vendor to LOCAL_REQUIRED_MODULES for vendor" am: 5f7e4f6bbf
am: 361e29936c

Change-Id: I9c6646db780dbdf83a278faa44126efccaa16729
2018-04-25 17:01:42 -07:00
Logan Chien
361e29936c Merge "Add .vendor to LOCAL_REQUIRED_MODULES for vendor"
am: 5f7e4f6bbf

Change-Id: I14ca4e78e5e387e2eca6b0a590ab635132e7b91e
2018-04-25 16:56:54 -07:00
Logan Chien
5f7e4f6bbf Merge "Add .vendor to LOCAL_REQUIRED_MODULES for vendor" 2018-04-25 23:46:28 +00:00
Calin Juravle
7d701355e9 Fix speed-profile compilation for prebuilds
We were testing the wrong variable when setting the dex2oat flags

Test: m; flash, dumpsys dexopt and check for speed-profile
Bug: 78515726
Change-Id: I57c0e11aab2e4879c3ba3b2851f356b5864f5da9
2018-04-25 15:28:53 -07:00
Chih-hung Hsieh
f9834f5827 Merge "Disable LLD for Darwin host executables." am: 29adef4ec2
am: 2371c3f08a

Change-Id: I46d5ae860d7bbcce736b2f8f25498b774a6790ef
2018-04-24 23:41:58 -07:00
Chih-hung Hsieh
2371c3f08a Merge "Disable LLD for Darwin host executables."
am: 29adef4ec2

Change-Id: I9ecbd4b6a062f1a9d6cf5014ce1a65a51464d17c
2018-04-24 23:38:00 -07:00
Chih-hung Hsieh
29adef4ec2 Merge "Disable LLD for Darwin host executables." 2018-04-25 06:30:59 +00:00
Chih-Hung Hsieh
3365ae7228 Disable LLD for Darwin host executables.
* See upstream status of lld for Mach-O at https://lld.llvm.org/AtomLLD.html

Bug: 73768157
Test: make checkbuild
Change-Id: I20330bd59cc8b3d0ed0fa08d3f1c2be7b8656849
2018-04-24 19:08:41 -07:00
Yohei Yukawa
d9e3412435 Merge "Stop pre-installing OpenWnn by default" into pi-dev
am: 906d70c9a1

Change-Id: Ic7728c7eb6248749cf4c4259959541edbd0bd802
2018-04-24 13:37:58 -07:00
TreeHugger Robot
906d70c9a1 Merge "Stop pre-installing OpenWnn by default" into pi-dev 2018-04-24 20:25:02 +00:00
Isaac Chen
dfaccc7f05 [automerger skipped] Merge "Enable VNDK for aosp_arm(64)" am: 50958e2cae
am: 6e06d8821e  -s ours

Change-Id: I3e982d1a21749c2222932479d83847829418e151
2018-04-24 11:27:19 -07:00
Isaac Chen
6e06d8821e Merge "Enable VNDK for aosp_arm(64)"
am: 50958e2cae

Change-Id: I303787e8ad324ca9d4064d0e6081862e3dcc1158
2018-04-24 11:21:42 -07:00
Isaac Chen
50958e2cae Merge "Enable VNDK for aosp_arm(64)" 2018-04-24 18:10:44 +00:00
Isaac Chen
27ddc1d1b9 [automerger skipped] Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" am: a0f595ec69
am: 68ea56253b  -s ours

Change-Id: Ib922830b4abb0e698ee1c98aa82fdcf03a96ee7b
2018-04-24 06:48:02 -07:00
Isaac Chen
68ea56253b Merge "ARM emulator: aosp_arm on 64-bit binder and kernel"
am: a0f595ec69

Change-Id: Ic98cd7a1a8615925d3775aefaedf7d0f065af4a5
2018-04-24 06:42:30 -07:00
Treehugger Robot
a0f595ec69 Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" 2018-04-24 13:35:01 +00:00
Isaac Chen
5327e98b1a Enable VNDK for aosp_arm(64)
This is needed for the system images of aosp_arm(64) products to
be used as their respective GSIs in P, and for also aosp_arm(64)
products to boot with the current GSIs.

Bug: 78255604
Test: Built and booted the following products to home screen
    $ lunch aosp_arm-userdebug; m -j; emulator
    $ lunch aosp_arm64-userdebug; m -j; emulator
    # The system image, both userdebug and user builds, of
    # aosp_arm64 could also boot to home screen and browse
    # the network on a physical device.

Change-Id: I83b79fd4d4e6e522ee78c720fb8c5f6f67ee411b
Merged-In: I83b79fd4d4e6e522ee78c720fb8c5f6f67ee411b
(cherry picked from commit f71547079a)
2018-04-24 19:12:11 +08:00
Isaac Chen
9cbaac5cb7 Merge "Enable VNDK for aosp_arm(64)" into pi-dev
am: 04e361a795

Change-Id: I2aedb55e7bbd112bb31da74bba4809b2f33f0515
2018-04-23 22:05:05 -07:00
TreeHugger Robot
04e361a795 Merge "Enable VNDK for aosp_arm(64)" into pi-dev 2018-04-24 04:58:12 +00:00
Isaac Chen
cb403acee8 [automerger skipped] Merge "Make aosp_$arch system images closer to GSIs" am: 3527ff9b84
am: ce3d0038a0  -s ours

Change-Id: I130029f47592d86983c32325ecad57c270d3bcbb
2018-04-23 19:31:25 -07:00
Isaac Chen
ce3d0038a0 Merge "Make aosp_$arch system images closer to GSIs"
am: 3527ff9b84

Change-Id: Ic70bdb54da74e66c96873b32d527421e7a212de2
2018-04-23 19:27:45 -07:00
Treehugger Robot
3527ff9b84 Merge "Make aosp_$arch system images closer to GSIs" 2018-04-24 02:19:23 +00:00
Isaac Chen
69d5bf7c6d [automerger skipped] Merge "Enable vndk_package if BOARD_VNDK_VERSION is set" am: ecc09990e3
am: 206286b671  -s ours

Change-Id: Ib81f5cd83a57d24fa73c70050c1901f0ccb89385
2018-04-23 19:19:23 -07:00
Isaac Chen
206286b671 Merge "Enable vndk_package if BOARD_VNDK_VERSION is set"
am: ecc09990e3

Change-Id: I17982b85c14ff4cea5c9d47b11d9998db4435879
2018-04-23 19:16:12 -07:00
Isaac Chen
50e6251baa ARM emulator: aosp_arm on 64-bit binder and kernel
Starting in P, all 32-bit and 64-bit architectures use 64-bit
binder interface. This is similar to ag/3576770 for x86.

Bug: 71861550
Test: the following products can boot to home screen successfully:
    lunch aosp_arm-userdebug; m -j; emulator
    lunch sdk_phone_armv7-userdebug; m -j; emulator
Change-Id: Ibe1f53a5798342555e2e84395a13b48d461f483d
Merged-In: Ibe1f53a5798342555e2e84395a13b48d461f483d
(cherry picked from commit 6f114c0110c466d2a117f3e531f9ea5170a121ee)
2018-04-24 10:10:50 +08:00
Isaac Chen
ecc09990e3 Merge "Enable vndk_package if BOARD_VNDK_VERSION is set" 2018-04-24 02:08:44 +00:00
Isaac Chen
a13b3153c1 Enable vndk_package if BOARD_VNDK_VERSION is set
This is a first attempt to enable build system support to include
vndk_package automatically (if BOARD_VNDK_VERSION is set), so devices
don't need to add it via PRODUCT_PACKAGE manually.

Bug: b/67002788
Test: Booted on the x86 emulator and a physical device and checked
      their /system/lib*/vndk-* directories for vndk_package libraries.
    # The commands below are for the x86 emulator:
    $ lunch aosp_x86_64-userdebug; m -j
Change-Id: Iea927b9535c7ee1b64ca130a4ac54f0fd8b3f758
Merged-In: Iea927b9535c7ee1b64ca130a4ac54f0fd8b3f758
(cherry picked from commit 5364f5a298)
2018-04-24 10:07:10 +08:00
Isaac Chen
0c97f084c7 Make aosp_$arch system images closer to GSIs
This change modifies aosp_$arch product makefiles so their
system images can be closer to their respective GSIs.

The added contents in this CL are based on treble_common*.mk.
Contents specific to GSI are in aosp_$arch.mk.
Contents common to all devices are moved to full_base.mk.
Contents related to specific device are moved to device.mk.

BoardConfig related makefiles will be changed in another CL.

Bug: 70772101
Test: The following products can boot to home screen:
    $ lunch aosp_x86-userdebug; m -j; emulator
    $ lunch aosp_x86_64-userdebug; m -j; emulator
    $ lunch aosp_arm-userdebug; m -j; emulator
    $ lunch aosp_arm64-userdebug; m -j; emulator

Change-Id: I225a13dd74b3e748cc5d1705e1a453348b01d43f
Merged-In: I225a13dd74b3e748cc5d1705e1a453348b01d43f
(cherry picked from commit 164eed2e7d)
2018-04-24 10:03:14 +08:00
Jiyong Park
4add87a9a7 Merge "Set BOARD_SYSTEMSDK_VERSIONS automatically for P-launching device" into pi-dev
am: e2ed4833bb

Change-Id: I7347e97b3431de623067733d231d1e211769ca65
2018-04-23 18:10:26 -07:00
Tao Bao
133d720ee3 Merge "releasetools: Group the option descriptions in ota_from_target_files.py." am: eafa928737
am: 1456eed8fb

Change-Id: I8273f6e0501cfb5421be4549d26210e1a0b46032
2018-04-23 18:07:23 -07:00
Tao Bao
1456eed8fb Merge "releasetools: Group the option descriptions in ota_from_target_files.py."
am: eafa928737

Change-Id: I8120258c92ef0c752b6222338fc22b44f067a17a
2018-04-23 18:02:45 -07:00
Treehugger Robot
eafa928737 Merge "releasetools: Group the option descriptions in ota_from_target_files.py." 2018-04-24 00:54:05 +00:00
TreeHugger Robot
e2ed4833bb Merge "Set BOARD_SYSTEMSDK_VERSIONS automatically for P-launching device" into pi-dev 2018-04-24 00:50:47 +00:00
Tao Bao
30df8b4e2e releasetools: Group the option descriptions in ota_from_target_files.py.
This CL separates the options into three groups (excluding the global
options provided via common.py).
 - Non-A/B OTA specific options;
 - A/B OTA specific options;
 - Common options that apply to both.

It mostly reshuffles the lines, with minor change to "--verify" that
removes the obselete remounting behavior (which doesn't apply to
block-based OTA).

Hopefully this makes the expected behavior of some options less
confusing.

Test: `build/make/tools/releasetools/ota_from_target_files.py`
Change-Id: I194ea52c4f7d6a3c7f34531abbcf3fdc7b7f4fa8
2018-04-23 16:00:14 -07:00
Tao Bao
91e76190f8 Merge changes from topic "cp-space" am: ffb88397f7
am: 187c93a597

Change-Id: I988ae3b70b87bdb27bf2a470b3c6b79e588a4266
2018-04-23 11:35:28 -07:00
Tao Bao
187c93a597 Merge changes from topic "cp-space"
am: ffb88397f7

Change-Id: I1f907664eca0e5658d6385dbedd1951d07758374
2018-04-23 11:31:35 -07:00
Calin Juravle
46661963c0 Merge "Update profile rules to support binary profiles" into pi-dev
am: cf4e0a074b

Change-Id: Ic6c1663681e20ad2972a30eda39ccc76cdbd02db
2018-04-23 11:28:31 -07:00
Treehugger Robot
ffb88397f7 Merge changes from topic "cp-space"
* changes:
  releasetools: Default journal size to 0 for system images.
  build_image: default extfs reserved size to 0 on RO partitions.
2018-04-23 18:19:40 +00:00