Commit graph

50076 commits

Author SHA1 Message Date
Tao Bao
5a5d4e0d63 Merge "releasetools: Update the comment on common.AVB_PARTITIONS."
am: 7b3e97b1ea

Change-Id: I7bdbd2e46c79a4ca5c138dd4681448a4ad032bbe
2019-04-22 20:27:34 -07:00
Tao Bao
7b3e97b1ea Merge "releasetools: Update the comment on common.AVB_PARTITIONS." 2019-04-23 03:09:26 +00:00
Bowgo Tsai
3b76f3be0c Merge "Adding boot-debug.img and ramdisk-debug.img"
am: 7d7c08d6c4

Change-Id: Ica3cb197565c3f6110f14e11551c77fcf96c4e0c
2019-04-22 19:17:30 -07:00
Treehugger Robot
7d7c08d6c4 Merge "Adding boot-debug.img and ramdisk-debug.img" 2019-04-23 02:01:36 +00:00
Tao Bao
bf3c47695c Merge "Move update-payload-key.pub.pem into a module."
am: 22c434e80f

Change-Id: I70366ba1981312f2f9109c868dc170e09a88a32c
2019-04-22 10:34:34 -07:00
Tao Bao
22c434e80f Merge "Move update-payload-key.pub.pem into a module." 2019-04-22 17:16:46 +00:00
Colin Cross
4fab05065d Merge "Allow codename.fingerprint format for targetSdkVersion"
am: 2d34ee923a

Change-Id: Ibebd76390f1bfd86fecb9924d6db39f375acaa79
2019-04-22 10:04:15 -07:00
Colin Cross
2d34ee923a Merge "Allow codename.fingerprint format for targetSdkVersion" 2019-04-22 16:48:35 +00:00
Bowgo Tsai
0013f55ef4 Adding boot-debug.img and ramdisk-debug.img
The two new debugging images adds additional files based on
boot.img and ramdisk.img/ramdisk-recovery.img, respectively.

File /force_debuggable is to trigger special logic in /init to load an
userdebug version of sepolicy and an additional property file from this
ramdisk to allow adb root, if the device is unlocked.

It's intentional to skip signing for boot-debug.img, as it can
only be used if the device is unlocked, where verification error
is allowed.

Those debugging images allows adb root on user build
system.img, vendor.img, product.img, etc. This can facilitate more
automated testings on user builds and is helpful to narrow down the
delta between what's being tested v.s. what's being shipped.

Bug: 126493225
Test: `make dist`, checks both boot-debug.img and ramdisk-debug.img
      are in $OUT/ and out/dist.
Test: `make dist`, checks installed-files-ramdisk-debug.{json,txt} are
       in out/dist.
Test: `system/core/mkbootimg/unpack_bootimg.py --boot_img $OUT/boot-debug.img`,
      checks the extracted out/ramdisk is as expected
Test: Run `gunzip -c ramdisk | cpio -idm` for the ramdisk extracted from
      $OUT/boot-debug.img and $OUT/boot.img, respectively.
      Then compare the root dirs of both, e.g.,
      `diff -rq --no-dereference ./ramdisk ./ramdisk-debug`
Test: `make ramdisk_debug-nodeps` and `make bootimage_debug-nodeps`

Change-Id: I30137c3caef91805d9143d404e5e4d06c0fccc30
2019-04-22 21:50:07 +08:00
SzuWei Lin
87381a80fc Merge "Disable non-AOSP nnapi extensions on product partition in GSI"
am: 6a3d438aa0

Change-Id: Id7d4c9cb3c60d57d3fc107dfc93e798300483db1
2019-04-22 04:57:44 -07:00
Treehugger Robot
6a3d438aa0 Merge "Disable non-AOSP nnapi extensions on product partition in GSI" 2019-04-22 11:46:13 +00:00
SzuWei Lin
3c6fde2d90 Disable non-AOSP nnapi extensions on product partition in GSI
The extensions is for OEM. To avoid AOSP code using OEM
extensions mistakenly. GSI denys product to use the extensions
by enabling the following property:

    ro.nnapi.extensions.deny_on_product=true


Bug: 129900377
Test: make gsi_arm64-userdebug, check /system/build.prop
Change-Id: Ia679f1f9c108bd5a164c8cdeb1d73f57da755608
2019-04-22 06:28:13 +00:00
Tao Bao
5873a854a4 Merge "Build otacerts as a module."
am: 967105ada9

Change-Id: I0e9a07ff2d267fb215d10fd5faf4d89dd1f2e3cb
2019-04-21 18:34:50 -07:00
Tao Bao
0733fbeaf8 Move update-payload-key.pub.pem into a module.
This allows update_engine listing the file as a required module,
regardless of the value in AB_OTA_UPDATER.

Bug: 130516531
Test: Build aosp_arm64-userdebug w/o setting AB_OTA_UPDATER. Check that
      /system/etc/update_engine/update-payload-key.pub.pem is available.
Change-Id: Ied041aca750e7260402ae8dbf65ff740d0b87205
2019-04-21 18:25:24 -07:00
Tao Bao
967105ada9 Merge "Build otacerts as a module." 2019-04-22 01:20:42 +00:00
Tao Bao
6f34013ba6 Build otacerts as a module.
Bug: 30414428
Test: `m -j dist` with aosp_taimen-userdebug. Check
      /system/etc/security/otacerts.zip available under system and
      recovery images.
Change-Id: I5abeb2da441fb3e3231e094063c2383eb3807852
Merged-In: I5abeb2da441fb3e3231e094063c2383eb3807852
2019-04-21 14:24:43 -07:00
Lev Rumyantsev
58cc3d3ee1 Merge "Move default native.bridge property to system set"
am: 1a5e781659

Change-Id: I3db998589a706748164d8d649e08071c028d9f57
2019-04-21 14:19:45 -07:00
Treehugger Robot
1a5e781659 Merge "Move default native.bridge property to system set" 2019-04-21 21:06:49 +00:00
Colin Cross
009981c5e4 Merge "Use framework.aidl built by Soong"
am: ab2b34b8fd

Change-Id: Ib32c4eb3d1ff205fc3abc1a5a8527aed80f74990
2019-04-21 10:29:30 -07:00
Colin Cross
ab2b34b8fd Merge "Use framework.aidl built by Soong" 2019-04-21 17:20:17 +00:00
Lev Rumyantsev
7e9f49c73c Move default native.bridge property to system set
So that it can be overridden by PRODUCT_PROPERTY_OVERRIDES.

Test: native bridge property is overridden when requested
Bug: 130825973
Bug: 130564502
Change-Id: I8413b9b5b2ac24ac62b6cf22a5f14393420927f5
2019-04-20 23:02:16 -07:00
Dan Willemsen
cc12e1759d Merge "Fix typo of PRODUCT_BUILD_ODM_IMAGE"
am: a8abd3beb7

Change-Id: I1605dbd4a69c117d07ae469244f4fc3c98a05020
2019-04-19 23:36:47 -07:00
Treehugger Robot
a8abd3beb7 Merge "Fix typo of PRODUCT_BUILD_ODM_IMAGE" 2019-04-20 06:26:04 +00:00
Dan Willemsen
6aeacea8c7 Merge "Master is now designated for R. Update MAX_PLATFORM_VERSION, etc."
am: 91871f3692

Change-Id: Idca43a79f8bf8129eb16e4f2d56117ebc1ce160c
2019-04-19 19:00:42 -07:00
Dan Willemsen
91871f3692 Merge "Master is now designated for R. Update MAX_PLATFORM_VERSION, etc." 2019-04-20 01:06:00 +00:00
Dan Willemsen
69cabb9607 Merge changes from topics "obsolete_broken_dup_copy_headers", "obsolete_broken_phony_targets"
am: 0b683a8f8d

Change-Id: Id0b3df7ea67ce7d14fd74478831ec1c974b30cb8
2019-04-19 17:08:56 -07:00
Dan Willemsen
e0ea6c8c9a Obsolete BUILD_BROKEN_PHONY_TARGETS
am: 407ca587be

Change-Id: Id49e8eaf359c21c906c350604bed1f1719609c4d
2019-04-19 17:08:01 -07:00
Treehugger Robot
0b683a8f8d Merge changes from topics "obsolete_broken_dup_copy_headers", "obsolete_broken_phony_targets"
* changes:
  Obsolete BUILD_BROKEN_DUP_COPY_HEADERS
  Obsolete BUILD_BROKEN_PHONY_TARGETS
2019-04-19 23:56:14 +00:00
Dan Willemsen
25a6937d34 Fix typo of PRODUCT_BUILD_ODM_IMAGE
Bug: 130879723
Test: treehugger
Change-Id: Ibe6523ca77aeb1ff6fdd138dcf2bfa46bcdeee59
2019-04-19 15:00:12 -07:00
Dan Willemsen
1d4a56f1a0 Obsolete BUILD_BROKEN_DUP_COPY_HEADERS
There are no remaining users.

Test: treehugger
Change-Id: I1fd5b933372e3ea391c121d265f41c35b832b206
2019-04-19 18:28:53 +00:00
Dan Willemsen
407ca587be Obsolete BUILD_BROKEN_PHONY_TARGETS
There are no remaining users.

Test: treehugger
Change-Id: Ice6f25a59265305e7e5d3dd041b16cd04674dd1e
2019-04-19 11:26:14 -07:00
Tao Bao
b4512fe596 Merge "Add support for TARGET_SCREEN_DENSITY"
am: 2a41c7e48a

Change-Id: Id741efde3e7e187775013b2a84f9b5c46865921f
2019-04-19 10:33:47 -07:00
Tao Bao
2a41c7e48a Merge "Add support for TARGET_SCREEN_DENSITY" 2019-04-19 17:19:49 +00:00
Anton Hansson
45a40da0d5 Add support for TARGET_SCREEN_DENSITY
This variable is used to populate the ro.sf.lcd_density property
in /vendor/build.prop, as well as choosing the correct density
bucket for assets in recovery.

Bug: 118676832
Test: inspect taimen and crosshatch in recovery
Test: adb shell getprop ro.sf.lcd_density
Change-Id: I80cf4d28ecfbae17f1ee206a279e7d9144bd7c05
Merged-In: I80cf4d28ecfbae17f1ee206a279e7d9144bd7c05
(cherry picked from commit 0dc9878af0)
2019-04-19 09:19:53 -07:00
Daniel Norman
a40cffbea9 Merge "Adds --output-img flag to enable building the IMG package."
am: 235f7d7686

Change-Id: I8b058ea7e53f39fa9a313da0dd04d70a41a2f548
2019-04-18 19:56:40 -07:00
Treehugger Robot
235f7d7686 Merge "Adds --output-img flag to enable building the IMG package." 2019-04-19 02:43:20 +00:00
Calin Juravle
45db542051 Merge changes I25b0c03e,I8a8a93ca
am: 442942c4de

Change-Id: I7adfbb648c6f5119e9a71cf3302c8ac708c75adc
2019-04-18 19:12:35 -07:00
Calin Juravle
442942c4de Merge changes I25b0c03e,I8a8a93ca
* changes:
  Add the entire boot image to boot.zip
  Disable iorapd by default
2019-04-19 01:57:09 +00:00
Calin Juravle
6bfdcda0e6 Add the entire boot image to boot.zip
Add all the boot image files necessary of offline inspection and
compilation in a single zip file (boot.zip).

This replaces the previous boot_profiles_jars.zip which contained only the
jar files.

Bug: 130376456
Test: m dist

Change-Id: I25b0c03ee9e7a2c2ff25db406656ce79baff5a46
Merged-In: Ib71c4fcc0d451570d0bb0584745487c54f884fd9
(cherry picked from commit 3dfae3f149)
2019-04-18 17:48:39 -07:00
Mathieu Chartier
ef66a8b7da Disable iorapd by default
Test: reboot and verify iorapd is not running
Bug: 123595428
Bug: 72170747

(cherry picked from commit 3dbd7356de)

Merged-In: I9c53714d6a35f8cb016e0baceeb12482d50557a5
Change-Id: I8a8a93ca088c577e0e7ac9600313c433c573f759
2019-04-18 17:48:30 -07:00
Daniel Norman
1bd2a1d946 Adds --output-img flag to enable building the IMG package.
This simplifies the use case for mixed build users. Instead of having to
remember to call img_from_target_files.py after this script, they can
use this flag to automatically create the IMG package.

Also includes an update to super_empty.img logic. The super_empty.img is
now always created for dynamic-partition builds. The flag now only
controls copying the super_empty.img to a user-provided location.

Bug: 129976345
Test: Ran merge_target_files.py using --output-img and
--output-super-empty and inspected the resulting img zip and
super_empty.img.

Change-Id: Ida602942bb7a6b4b94f4e225640af9104fc9360c
2019-04-18 16:37:29 -07:00
Colin Cross
d60401a59b Allow codename.fingerprint format for targetSdkVersion
Use codename.fingerprint format for targetSdkVersion if it is unset
in the manifest and UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true.

Test: manual
Bug: 130541924
Change-Id: Ie748d1963ff6f525f8d9e551b73846c3e1c7f9a2
2019-04-18 16:05:19 -07:00
Colin Cross
eaa2c875f0 Merge "Don't set LOCAL_SDK_RES_VERSION to current if LOCAL_SDK_VERSION is core_current"
am: e55ec5ba1b

Change-Id: I391295c91268c7853ff97d01156d02a222344492
2019-04-18 14:41:32 -07:00
Treehugger Robot
e55ec5ba1b Merge "Don't set LOCAL_SDK_RES_VERSION to current if LOCAL_SDK_VERSION is core_current" 2019-04-18 21:15:18 +00:00
Dan Willemsen
a3f7a5fb6d Merge "TARGET_FS_CONFIG_GEN is a list, not a single path"
am: 0d4ee006db

Change-Id: Ie7733c22baa9a1f401dd5e2244a89e8bdc310a20
2019-04-18 12:48:08 -07:00
Treehugger Robot
0d4ee006db Merge "TARGET_FS_CONFIG_GEN is a list, not a single path" 2019-04-18 19:37:49 +00:00
Colin Cross
50bf3127d9 Use framework.aidl built by Soong
Bug: 130798034
Test: m checkbuild
Change-Id: I24621b41860ce1fd1c3ba067430c8d62b49d03cb
2019-04-18 12:06:27 -07:00
Colin Cross
85f2b4a680 Don't set LOCAL_SDK_RES_VERSION to current if LOCAL_SDK_VERSION is core_current
Removing AAPT1 support removed the distinction between unset
LOCAL_USE_AAPT2 and LOCAL_USE_AAPT2 := true, which enabled the
LCOAL_SDK_RES_VERSION setting for some modules that had previously
bypassed it because of LOCAL_USE_AAPT2 := true.  The workaround
was too broad, it shouldn't apply if LOCAL_SDK_VERSION is already
set to *current.  In particular, if it is core_current to disable
using framework-res.apk completely, then LOCAL_SDK_RES_VERSION
must not be set to current.

Fixes: 130782219
Test: atest android.server.wm.PrereleaseSdkTest
Change-Id: I250d65b1ef66e591f2c9779580df4cc3f0f2b028
2019-04-18 11:14:58 -07:00
Dan Willemsen
551909fd58 Merge changes from topic "make_deprecation"
am: c1a836bab0

Change-Id: I02a57f817e6d459d0c0f3607fbb0169e29addb18
2019-04-18 10:58:56 -07:00
Dan Willemsen
c1a836bab0 Merge changes from topic "make_deprecation"
* changes:
  Add infrastructure for deprecating module types
  Mark BUILD_* as readonly
2019-04-18 17:44:19 +00:00