Commit Graph

48785 Commits

Author SHA1 Message Date
Tom Cherry
8bca10ade4 Merge "Remove TARGET_ANDROID_FILESYSTEM_CONFIG_H" 2019-02-12 21:10:41 +00:00
Xin Li
798d2a795e DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Bug: 124234733
Change-Id: Iade9f985e598b9c83746c8250eb88831626c9da5
2019-02-12 10:12:55 -08:00
Steven Laver
4225bbcbbe Merge "Allow properties to be derived from partition-specific properties"
am: 0cf76f544b

Change-Id: Ie0bb9a05c19be7736454589f8101d1608c6a434c
2019-02-12 08:52:08 -08:00
Steven Laver
0cf76f544b Merge "Allow properties to be derived from partition-specific properties" 2019-02-12 16:44:57 +00:00
Remi NGUYEN VAN
333c98517b Add test keys for networkstack
The networkstack is using shared test keys for NetworkStack.apk,
CaptivePortalLogin.apk and NetworkStackPermissionStub.apk.

This allows NetworkStackPermissionStub.apk to define signature
permissions without the platform certificate, and enforce that the other
packages match the signature to use the permissions if they are
installed.

Bug: 124033493
Test: m
Change-Id: I7257a472d702e82acdadffc4e0535c63a8bd591d
2019-02-13 00:57:41 +09:00
Nicolas Geoffray
98f5e86660 Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system.""
This reverts commit a81dad1bc4.

Test: build && atest android.text.cts.EmojiTest#testEmojiGlyphWebView on Cuttlefish
Change-Id: Ie3c43830fc9a994ed35883abb8ca71d97bd5c44d
2019-02-12 14:00:38 +00:00
Jiyong Park
cd3825adc7 Merge "TARGET_FLATTEN_APEX for GSI"
am: 84f1ade63f

Change-Id: If45249e72680a416453ed28853748df9d55e66ce
2019-02-12 00:14:58 -08:00
Jiyong Park
84f1ade63f Merge "TARGET_FLATTEN_APEX for GSI" 2019-02-12 08:04:39 +00:00
Dan Willemsen
5436c7e583 Obsolete add_lunch_combo
Bug: 77599627
Test: source build/envsetup.sh with add_lunch_combo calls in bash & zsh
Change-Id: If12b41d8f9a2f56efdb64ad0dccc25a1e342fdd1
2019-02-11 21:36:25 -08:00
Jim Tang
b3fda301c2 Add Asuite prebuilds in PATH and remove functions.
Remove atest/acloud/aidegen functions and append prebuilt path
in PATH. Use local built by default; if there is no local built,
use the prebuilt one instead.

Bug:

Test: $ source build/envsetup.sh; lunch
      $ echo $PATH|sed 's/:/\n/g' | egrep "out|asuite"
      # will see out/host prioritises prebuilts/asuite.

Change-Id: I1e5869bcb81cf7058cf8971f480a47d2c8f8b6f0
2019-02-12 11:29:28 +08:00
Jeongik Cha
39fa5c4357 Merge "Detect shareduid between different partitions"
am: 1b082c3e05

Change-Id: Ib9ccfd4d63aa306d64f800498a1d14ebcf3654f0
2019-02-11 17:11:43 -08:00
Treehugger Robot
1b082c3e05 Merge "Detect shareduid between different partitions" 2019-02-12 00:55:08 +00:00
Colin Cross
87378f1888 Move dexpreopt image selection out of dexpreopt_gen
Instead of passing both the module and global dexpreopt image
selection into dexpreopt_gen, determine the correct dexpreopt
image in Make.  This allows the Make dexpreopt rule to only
depend on the necessary boot images, preventing an order-only
dependency on the 32-bit boot image for a 64-bit only module.

Also stop using the boot image "location" as an input, only
track the real path, which will be converted to the "location"
that dex2oat expects when constructing the command line in
dexpreopt_gen.

Removes support for the unused LOCAL_DEX_PREOPT_IMAGE_LOCATION
variable.

Test: m checkbuild
Change-Id: I2e3e1d30fdfed92fb08e6cc1c9515edf8d99c7f0
2019-02-11 15:25:07 -08:00
Steven Laver
9e73e82a12 Allow properties to be derived from partition-specific properties
This change allows ro.product.[brand|device|manufacturer|model|name] and
ro.build.fingerprint to be derived at boot time (and in the OTA
generation scripts) from partition-specific properties.

Test: booted system image, verified properties
Test: booted recovery image, verified properties
Test: unpacked OTA package, verified build fingerprint
Bug: 120123525
Change-Id: Iadd230a0577f35c7c37b0f911e91a5c2863ed1fe
2019-02-11 23:03:00 +00:00
Mathieu Chartier
f7f965ca40 Merge "Revert "Enable layout compilation by default""
am: 5838c3f8bb

Change-Id: Ibe348b1cb778b897549439ddac5bfdfd193a40e9
2019-02-11 14:39:37 -08:00
Mathieu Chartier
5838c3f8bb Merge "Revert "Enable layout compilation by default"" 2019-02-11 22:10:55 +00:00
Mathieu Chartier
fd2ae2892e Revert "Enable layout compilation by default"
This reverts commit 2e321b0e85.

Layout equality test is failing.
Bug: 111895153
Bug: 124248633
Exempt-From-Owner-Approval: Revert

Change-Id: Ia5c66b7a41963cd1b874c734164677f1fdcebb67
2019-02-11 22:10:40 +00:00
Tom Cherry
e0f3ed5cd0 Remove TARGET_ANDROID_FILESYSTEM_CONFIG_H
TARGET_FS_CONFIG_GEN has existed as the preferred mechanism for two
releases, so we finally deprecate TARGET_ANDROID_FILESYSTEM_CONFIG_H.

Test: build
Change-Id: I299a4d1d1d893ac16d6e6ce2ec4659bfcdc19095
2019-02-11 13:45:01 -08:00
Anton Hansson
dce3f920f2 Move dump-products back to the config stage
It's unnecessary to run all the make file parsing to dump product
configs. Move the dumping to product_config.mk instead, but switch
the output to $(warnings) as stdout is a bit sensitive during
the config stage.

Test: multiproduct_kati -only-config dump-products
Change-Id: I8c7365c9f90ea2bf152b82dfb983bfb0cdcb1697
2019-02-11 21:19:54 +00:00
Colin Cross
18d4ba62d6 Merge "Revert "Never strip and store dex files uncompressed when they are preopted on system.""
am: 05ef66fc0b

Change-Id: I177eb88b2b63c784f30a029517fcc83b6a711e1a
2019-02-11 11:42:47 -08:00
Colin Cross
05ef66fc0b Merge "Revert "Never strip and store dex files uncompressed when they are preopted on system."" 2019-02-11 19:31:31 +00:00
Colin Cross
a81dad1bc4 Revert "Never strip and store dex files uncompressed when they are preopted on system."
This reverts commit 9cdc3beb3d.

Reason for revert: b/123436620

Change-Id: I45fa9236e37c3b7e2d44ede62a2701db2bc8a20d
2019-02-11 19:30:39 +00:00
Mathieu Chartier
a221a6e592 Merge "Enable layout compilation by default"
am: 0c44ba4eda

Change-Id: I64b5cc14ce4797c8f6c50d9b89f826161cd0b47e
2019-02-11 10:08:39 -08:00
Mathieu Chartier
0c44ba4eda Merge "Enable layout compilation by default" 2019-02-11 17:58:50 +00:00
Jiyong Park
c35a33e59c TARGET_FLATTEN_APEX for GSI
Regular (non-flattened) APEX may require changes to the kernel, which is
against the Treble promise. For maximum compatibility, APEXes are
flattened for GSI so that APEXes can be activated by legacy kernels.

Bug: 124159875
Test: N/A
Change-Id: Iea5701d3b917ebf8657d3ce38131c1838b51677e
2019-02-11 21:50:02 +09:00
Anton Hansson
faf0bbf2b8 Merge "Enable suspend for mainline charger"
am: c75e5ba356

Change-Id: Iad3f8ca78c7515322ce2122bcac905f51e3cbe9a
2019-02-11 03:02:35 -08:00
Anton Hansson
c75e5ba356 Merge "Enable suspend for mainline charger" 2019-02-11 10:53:49 +00:00
Nicolas Geoffray
b2d2793762 Merge "Never strip and store dex files uncompressed when they are preopted on system."
am: f07d63390c

Change-Id: I513795a11decf29bcb8afa32b0eb778edf5f0400
2019-02-11 02:40:49 -08:00
Nicolas Geoffray
f07d63390c Merge "Never strip and store dex files uncompressed when they are preopted on system." 2019-02-11 10:31:12 +00:00
Anton Hansson
31a70ee8ea Merge "Tab completion for the croot function"
am: 5cbb363305

Change-Id: Ia1b45a7a278efba54ce8bf6246d4e9fa8019fee3
2019-02-11 02:21:25 -08:00
Anton Hansson
5cbb363305 Merge "Tab completion for the croot function" 2019-02-11 10:14:37 +00:00
Jiyong Park
744fd5698f Drop /root when installing symbols
This change fixes a problem that if a module is installed to the root
partition, its symbol file appears at under symbols/root, which is an
non-existing path at runtime. Since the symbol paths should match with
the runtime path, drop /root when installing symbols.

Bug: 123985838
Test: m libc.mountpoint
libc.so is found under symbols/bionic/lib[64]

Change-Id: I38bd226c3ec758d69902f4f288c83f68170c4068
2019-02-11 16:16:18 +09:00
Luca Stefani
7c7b4b6beb Fix flags argument passed to avbtool for GSI images
* avbtool expect extra flags to be passed with the --flags argument
  but currently we're missing an 's'.
  Luckily this isn't an issue as python argparse matches
  --flag as an alias to --flags ( python... )

Test: m vbmetaimage; check vbmeta header
Change-Id: I42d833c61c9b313dc067b1e519bae36395d09824
2019-02-10 19:59:27 +01:00
android-build-team Robot
641da2907b Make change and version bump to PPRL.190205.001
Change-Id: I66d528f1b45c68eac151c9c56b91c522e4674dab
2019-02-09 02:40:54 +00:00
Colin Cross
b568c2e15d Merge "Make manifest and APK agree on uncompressed native libs"
am: 010df4b471

Change-Id: Ib1521234aa42fbf5439e919b991c24f8bc8fcf7e
2019-02-08 18:38:16 -08:00
Treehugger Robot
010df4b471 Merge "Make manifest and APK agree on uncompressed native libs" 2019-02-09 02:25:32 +00:00
Nicolas Geoffray
9cdc3beb3d Never strip and store dex files uncompressed when they are preopted on system.
In order for the runtime module to always be able to compile apps,
make sure we keep a copy of the dex files optimally.

Gated by a product flag if a product doesn't include the module yet.

Test: build
Change-Id: Ia9bba7f6f12f3400078a43d39ba4134cf8818399
2019-02-08 22:45:48 +00:00
Hridya Valsaraju
2048a2db3f Merge "Only pick DTBs from BOARD_PREBUILT_DTBIMAGE_DIR"
am: 143ff1ff9a

Change-Id: If90742475357500d797f08b4fdea90b4329b308e
2019-02-08 14:14:40 -08:00
Chen Xu
73466c8bc1 Merge "Revert "Add Asuite prebuilds in PATH and remove functions.""
am: aaf8cdf59d

Change-Id: Ic51bed99735876ff2cefd2e88ba3eb47cbe209a6
2019-02-08 14:12:56 -08:00
Treehugger Robot
143ff1ff9a Merge "Only pick DTBs from BOARD_PREBUILT_DTBIMAGE_DIR" 2019-02-08 22:02:05 +00:00
Chen Xu
aaf8cdf59d Merge "Revert "Add Asuite prebuilds in PATH and remove functions."" 2019-02-08 21:58:33 +00:00
Chen Xu
a1cc558cdd Revert "Add Asuite prebuilds in PATH and remove functions."
This reverts commit dda51d42da.

Reason for revert: This change caused AOSP build breakage on NDK

Change-Id: I27973e8e0f08e5d71a405208ae4a6a855c751932
2019-02-08 21:52:59 +00:00
Dan Willemsen
265bd2fb92 Merge "Default to erroring when eng/debug tags are used"
am: 7067aaa13c

Change-Id: I651efc357d5d3a06ed35491ee3d591de53f2736f
2019-02-08 13:51:52 -08:00
Treehugger Robot
7067aaa13c Merge "Default to erroring when eng/debug tags are used" 2019-02-08 21:46:22 +00:00
Jim Tang
35fed77a88 Merge "Add Asuite prebuilds in PATH and remove functions."
am: fc58ed2fb7

Change-Id: I462f52a9a8619b4e3f445010e4ef4eb2d5da1b26
2019-02-08 13:05:31 -08:00
Dan Willemsen
78e94a46c9 Default to erroring when eng/debug tags are used
Some devices opt out of the warning with `BUILD_BROKEN_ENG_DEBUG_TAGS :=
true` still, but the rest have no more warnings left.

Test: build_test in treehugger
Change-Id: I1534a0db006d72c7921a20ab793586ef1c7bdb21
Merged-In: I1534a0db006d72c7921a20ab793586ef1c7bdb21
2019-02-08 13:03:23 -08:00
Treehugger Robot
fc58ed2fb7 Merge "Add Asuite prebuilds in PATH and remove functions." 2019-02-08 20:56:37 +00:00
Hridya Valsaraju
c63a74474b Only pick DTBs from BOARD_PREBUILT_DTBIMAGE_DIR
This change is required to prevent the build system
from picking up DTB files from subdirectories to
BOARD_PREBUILT_DTBIMAGE_DIR.

Test: make bootimage
Bug: 123648105

Change-Id: Ibc2a133f3c9be6362579dc9bf9ca399912b9d8a2
2019-02-08 09:36:44 -08:00
Anton Hansson
68028611f0 Merge "Remove non-existant packages from mainline_system"
am: 76d8591417

Change-Id: I9c5e52c9854f24268f567c62313ae153d73c3dd3
2019-02-08 06:39:46 -08:00
Anton Hansson
3b83ae8834 Merge "Remove DMService from mainline_system"
am: 21e0cbacfc

Change-Id: I63d265b3f4f99b1aea5d9d195ea705ab17d29e0a
2019-02-08 06:38:42 -08:00