Commit Graph

4359 Commits

Author SHA1 Message Date
Treehugger Robot
93030e3f4d Merge "GSI vbmeta.img: set rollback_index to zero" 2019-02-20 01:20:09 +00:00
Bowgo Tsai
c1a8f1a5d7 GSI vbmeta.img: set rollback_index to zero
The major purpose of vbmeta.img built on GSI targets (e.g., aosp_arm,
aosp_arm64, etc) is to disable AVB. We should also set the rollback
index to zero, to prevent the device bootloader from updating the
last seen rollback index in the tamper-evident storage.

Bug: 122583908
Test: build aosp_arm64, then `avbtool info_image --image $OUT/vbmeta.img`
Change-Id: I48a49957f8dd3169003b9507fe80e519f301d5b5
2019-02-19 10:38:40 +08:00
vichang
4ea3ad0e34 Merge "Add a bug number in the TODO tag" 2019-02-18 17:51:53 +00:00
Victor Chang
575379e30b Add a bug number in the TODO tag
- ICU4C is kept in PRODUCT_PACKAGES for the app compat issue

Bug: 124218500
Test: Treehugger
Change-Id: I9b98321c639e99c59e6a5ea45dd380f5f731a419
2019-02-18 11:54:07 +00:00
Treehugger Robot
6867fd7dda Merge "Fix flags argument passed to avbtool for GSI images" 2019-02-18 05:27:52 +00:00
Martin Stjernholm
fd0b822d09 Add libnpt back into system.
It must be there for libjdwp to find it and load the debugger transport
correctly. This is a temporary fix while we are looking into loading libnpt
from the Runtime APEX.

Bug: 124498388
Test: adb forward tcp:5555 jdwp:`adb shell pidof com.android.email` && jdb -attach localhost:5555
Test: atest CtsJdwpTestCases
Change-Id: I644c092c2ad5f6c9669bdccc24c7953d3be6b328
2019-02-15 15:08:50 +00:00
Treehugger Robot
b41ab14b1e Merge "Fix booting problem on GSI with user build" 2019-02-15 10:37:44 +00:00
SzuWei Lin
fd6d294c2b Fix booting problem on GSI with user build
GSI doesn't include gsi_system.prop on user build, and cause some
devices cannot boot GSI with user build. Some properies in
gsi_system.prop do not suitable for user build, the patch create
a new gsi_system_user.prop for GSI user build.

Bug: 124479721
Test: boot aosp_arm64-user on a blueline device.
Change-Id: Ide2bdc8e8733817afb832b50b28807768e22f011
2019-02-15 14:34:53 +08:00
Remi NGUYEN VAN
fc35e5aaa5 Merge "Add test keys for networkstack" 2019-02-15 04:11:07 +00:00
Treehugger Robot
da4ee462c7 Merge "Revert "Add APK container signing key/cert pairs for APEXes"" 2019-02-14 18:42:47 +00:00
Suren Baghdasaryan
72546076c8 Add cgroups.recovery.json into recovery image
Use cgroups.recovery.json as /etc/cgroups.json during recovery.

Bug: 124270406
Test: "adb reboot sideload; adb devices" shows 'sideload' as expected
Change-Id: I0af01a6801da7ce29ddd7c30ad48be4f98c3a280
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-02-14 17:08:55 +00:00
Jiyong Park
2237d06a78 Revert "Add APK container signing key/cert pairs for APEXes"
This reverts commit 74f27716f3.

The key/cert pairs for APEXes are moved to the same directory where the
APEXes are defined.

Test: Check this for all APEXes
jarsigner -verify -verbose -certs out/target/product/blueline/system/apex/com.android.tzdata.apex shows
...
X.509, CN=com.android.tzdata, OU=Android, O=Android, L=Mountain View, ST=California, C=US

Change-Id: I8d867b434b93aa68cbc707fa20ed8dbd4cef755e
2019-02-15 00:39:47 +09:00
Martin Stjernholm
a568592f53 Disable installation of ART modules in /system.
Remove ART modules (`art-runtime`, `art-tools`) from `PRODUCT_PACKAGES`, as
they are provided by the Android Runtime APEX module
(`com.android.runtime`).

Copy of rpl's http://r.android.com/812674.

Test: Flash and boot
Test: atest CtsJniTestCases
Test: atest CtsJdwpTestCases
Test: m checkbuild dist
Bug: 113373927
Change-Id: I3e0c130f1a9c596629ab243648f0251cf71c1499
2019-02-13 22:28:09 +00:00
Justin Yun
89443aed80 Add an option not to install all VNDK libs
When using VNDK snapshot, current VNDK libs are not required. Use
"TARGET_SKIP_CURRENT_VNDK=true" to skip installing current VNDK libs.

Bug: 123607022
Test: TARGET_SKIP_CURRENT_VNDK=true PRODUCT_EXTRA_VNDK_VERSIONS=28 m -j
Change-Id: I65c902c71a7952536bbf824a1dccb9360e843f1a
2019-02-13 10:46:10 +09: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
Jiyong Park
84f1ade63f Merge "TARGET_FLATTEN_APEX for GSI" 2019-02-12 08:04:39 +00: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
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
c75e5ba356 Merge "Enable suspend for mainline charger" 2019-02-11 10:53:49 +00: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
Mathieu Chartier
2e321b0e85 Enable layout compilation by default
Aims to get additional coverage of the view compiler. Note that the
compiled views are not currently loaded.

Test: adb shell getprop
Bug: 111895153

Change-Id: I7b172fc55bc47ee1593eb352fb9d9143f44a1e6c
2019-02-08 13:35:54 +00:00
Anton Hansson
b100f5b834 Enable suspend for mainline charger
Bug: 80410283
Test: make
Change-Id: I09efa8dd557d586424c342772925b9ab2940bc88
2019-02-08 13:34:49 +00:00
Anton Hansson
c8df56f35e Remove non-existant packages from mainline_system
Also add the health-check macro to the buildable products
to make sure no other non-existant packages are added.

Bug: 80410283
Test: build mainline_arm64 + mainline_system_arm64
Change-Id: I6c54de2f43b5ab0c9e0ddfa09fa7553c321e4aa7
2019-02-08 08:08:52 +00:00
Anton Hansson
ed5f6646b0 Remove DMService from mainline_system
Doesn't exist in AOSP.

Bug: 110072687
Test: make
Change-Id: I516ff4d647e62b8535e9bf648a156b010a328e93
Merged-In: I516ff4d647e62b8535e9bf648a156b010a328e93
2019-02-08 08:08:46 +00:00
Anton Hansson
375291fa26 Merge "Add bluetooth build config for mainline" 2019-02-07 08:07:06 +00:00
Steven Moreland
7bd8753381 Merge "mainline_system -= ...tests.libhwbinder@1.0-impl" 2019-02-06 18:16:54 +00:00
Anton Hansson
60bf75ae47 Add bluetooth build config for mainline
This matches the build config used on current mainline devices,
but should ideally be removed once possible.

Bug: 123695868
Test: boot blueline
Change-Id: I8fdef9fbe45b75f175afe9350974f54d1ec5e0c8
2019-02-06 15:51:03 +00:00
Orion Hodson
d2d3c048d0 Merge "Remove libsurfaceflinger_ddmconnection from PRODUCT_PACKAGES" 2019-02-06 08:51:39 +00:00
Tri Vo
7bd32730a4 Merge "Add ashmemd to base_system.mk" 2019-02-05 21:38:50 +00:00
Orion Hodson
172eae9364 Remove libsurfaceflinger_ddmconnection from PRODUCT_PACKAGES
DdmConnection dlopen's libart.so which is undesirable for the Runtime Module.

Bug: 120782499
Test: m -j100
Change-Id: I53aa1ee43da6cbee8a61c231e38d8bdad26c98e4
Merged-In: I53aa1ee43da6cbee8a61c231e38d8bdad26c98e4
2019-02-05 09:31:33 +00:00
Kostya Kortchinsky
027324099f Add option to disable Scudo globally [Make]
This adds an option to turn off Scudo globally, and use it for Go.

Bug: 123228023
Test: verify that Scudo is disabled for a Go build, eg:
lunch marlin_svelte-eng && m -j, check that Scudo is not linked in
out/target/product/marlin/system/bin/mediaextractor
Test: verify that Scudo is enabled otherwise, eg:
lunch marlin-eng && m -j, check that Scudo is linked in
out/target/product/marlin/system/bin/mediaextractor

Change-Id: Idc82d581fade544a474e6f2ff0b54dd191ba0818
Merged-In: Idc82d581fade544a474e6f2ff0b54dd191ba0818
2019-02-04 12:35:04 -08:00
Suren Baghdasaryan
521133d9d2 Add libjsoncpp into VNDK
Include libjsoncpp into vndk because libprocessgroup uses it
for task profile parsing.

Bug: 111307099
Test: builds, boots
Change-Id: I99ddc4db53a7e9b2b6122ca1f0360ded454d0d83
Merged-In: I99ddc4db53a7e9b2b6122ca1f0360ded454d0d83
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-02-02 17:06:54 +00:00
Suren Baghdasaryan
35fc328316 Add cgroups.json and task_profiles.json build targets
Add cgroups.json and task_profiles.json into the list of packages.

Bug: 111307099
Test: builds, boots

Change-Id: Ib8ab11de573505f522ccd9cec2c6afd7e23d2f2f
Merged-In: Ib8ab11de573505f522ccd9cec2c6afd7e23d2f2f
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-02-02 17:05:56 +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
Steven Moreland
5bc1844b2a mainline_system -= ...tests.libhwbinder@1.0-impl
Tests are configured to load this statically now.

Fixes: 122456128
Test: libhwbinder_benchmark, hwbinderThroughputTest, libhwbinder_latency
Change-Id: I5cd53642d8b6ddb85e79fd231280b9d26ce3ee35
2019-02-01 01:56:29 +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
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
Mathieu Chartier
8fdf4e0f5b Merge "Enable resolution of startup const-string for non user builds" 2019-01-30 22:40:03 +00:00
Treehugger Robot
7839861087 Merge "vndk: current: remove libpagemap" 2019-01-30 19:19:26 +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
59fa4ca993 Merge "Add gsi_common.mk" 2019-01-30 05:32:53 +00:00
Tri Vo
8c52dffaee Add ashmemd to base_system.mk
Bug: 113362644
Test: presubmit
Change-Id: Ic31ba5a86df82afc2ad76fda558360f5474ba931
2019-01-29 20:19:32 -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
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