Commit graph

3081 commits

Author SHA1 Message Date
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
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
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
Treehugger Robot
3a296fde5f Merge "base_vendor += dumpsys_vendor" 2019-01-29 01:46:08 +00:00
Ruchi Kandoi
fee423e64d Merge "add android.hardware.secure_element@1.1" 2019-01-28 21:49:55 +00:00
Yifan Hong
bf21932408 Merge "Add product_compatibitility_matrix.xml to base_product." 2019-01-28 18:08:44 +00:00
Anton Hansson
ad9ee4b504 Merge "Move mainline_arm64 over to use mainline device" 2019-01-28 10:49:32 +00:00
Anton Hansson
8fbdd25457 Merge "Add recovery_refresh to mainline_system" 2019-01-28 10:49:16 +00:00
Anton Hansson
096b88bf90 Merge "Auto-include device_manifest.xml when necessary" 2019-01-28 09:18:34 +00:00
Nicolas Geoffray
93626d9616 Merge "Move remaining libcore JNI libraries to APEX." 2019-01-28 09:16:21 +00:00
Pete Bentley
b8b08bdd02 Move remaining libcore JNI libraries to APEX.
Test: Flash and boot on Taimen
Test: atest CtsLibcoreTestCases CtsJniTestCases
Bug: 119090773
Change-Id: Ia9e7077327d2abc3f637c09acc5933b9c1682d5a
Exempt-From-Owner-Approval: Simple clean steps rule
2019-01-28 09:14:12 +00:00
Steven Moreland
442e983241 base_vendor += dumpsys_vendor
Bug: 123433249
Test: adb shell /vendor/bin/dumpsys
Change-Id: I989825c65d759fd07ff0d0f690bc45d056637528
2019-01-25 19:15:20 -08:00
Treehugger Robot
1ff476e216 Merge "Add APK container signing key/cert pairs for APEXes" 2019-01-25 19:46:08 +00:00
Jiyong Park
74f27716f3 Add APK container signing key/cert pairs for APEXes
Created via
openssl req -x509 -newkey rsa:4096 -nodes -days 999999 -keyout key.pem -out com.android.tzdata.x509.pem
openssl pkcs8 -topk8 -inform PEM -outform DER -in key.pem -out com.android.tzdata.pk8 -nocrypt

Test: m com.android.tzdata
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: I19f6efaaa6468e65e9891e4e61704fb48f0b986a
2019-01-26 02:19:58 +09:00
Suren Baghdasaryan
3a14d98f11 DO NOT MERGE: Revert "Revert "Add libprocessgroup into VNDK""
This reverts commit fec192e98f.

Reason for revert: AOSP is fixed with new vendor image

Change-Id: I2b7f4683139cf28bb5b8fa64c5c5273cf5c935a3
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-25 16:52:50 +00:00
Anton Hansson
d5e069e405 Auto-include device_manifest.xml when necessary
It doesn't make sense to specify a DEVICE_MANIFEST_FILE but the
build not including it. The conditional definition of the module
makes it problematic to have it listed in the PRODUCT_PACKAGES
of a generic mk.

Test: build mainline_arm64 + mainline_system_arm64
Change-Id: I40e435ce114263ceabbd373d3d719318c592fc13
2019-01-25 13:50:47 +00:00
Anton Hansson
14fb72c15c Move mainline_arm64 over to use mainline device
Possible now that it has TARGET_COPY_OUT set for vendor and
product.

Update the whitelist too.

Bug: 120974093
Test: make
Change-Id: I99eb718f5f4e79b9224a4079f2ff4595cd2b7ae2
2019-01-25 11:29:26 +00:00
Anton Hansson
91fddbbd95 Add recovery_refresh to mainline_system
Needed by recovery on devices without a cache partition.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I71fd35022b0928016f6767cea35971ce14bf03fe
2019-01-25 11:27:27 +00:00
Anton Hansson
dca5c961a2 Move PrintRecommendationService back to handheld_system
This app is not intended to be moved to /product.

Bug: 122353713
Test: lunch mainline_arm64; m nothing
Change-Id: I65464975a77e187591b3e2de2521f1b2876b5abf
2019-01-25 11:14:47 +00:00
Paul Duffin
22efcc114e Merge "Remove REMOVE_OAHL_FROM_BCP flag" 2019-01-24 16:01:40 +00:00
Suren Baghdasaryan
fec192e98f DO NOT MERGE: Revert "Add libprocessgroup into VNDK"
This reverts commit 1877db4591.

Reason for revert: Broke AOSP

Change-Id: I4f4b8bae60966f1459365387bbde5a1f60c7b727
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-23 20:52:04 -08:00
Ruchi Kandoi
4cb79e1412 add android.hardware.secure_element@1.1
Test: compiles
Bug: 122590188
Change-Id: Ibfbc3ecf5c19c42ea4ba695f2a9d6ad04cd9bf62
2019-01-23 14:31:39 -08:00
Yifan Hong
28ee89dda1 Add product_compatibitility_matrix.xml to base_product.
The module refers to framework compatibitlity matrix
that defined OEM modules.

Also, renamed framework_compatibility_matrix.xml
to system_compatibility_matrix.xml, since
framework_compatibility_matrix.xml consists of both
system and product compatibility matrices. This fixes
mainline build.

Test: build
Test: boot device with product compatibility matrix

Bug: 120600021
Change-Id: Ibfb12578c3ec77b6baede4eed852074e08022119
2019-01-23 12:22:04 -08:00
Anton Hansson
2ec9fcd951 Merge "Move ModuleMetadata to base_product" 2019-01-23 11:17:43 +00:00
Suren Baghdasaryan
1877db4591 Add libprocessgroup into VNDK
Include libprocessgroup into vndk because libprocessgroup now implements
sched_policy control functions.

Bug: 111307099
Test: builds, boots
Merged-In: If18227e8a824a1e606df78dfe01d9d2437c62792
Change-Id: If18227e8a824a1e606df78dfe01d9d2437c62792
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-22 18:16:56 +00:00
Anton Hansson
f2d90e9143 Move ModuleMetadata to base_product
The app is moving from /system to /product.

Bug: 122353713
Test: make
Change-Id: I0987b46013527503eedf75350bc30b303722552b
2019-01-22 18:07:03 +00:00
Paul Duffin
fd24c9fe1f Remove REMOVE_OAHL_FROM_BCP flag
The REMOVE_OAHL_FROM_BCP flag is always set to true and is no longer
necessary so this change removes any uses of the flag.

Bug: 18027885
Test: cts/tests/signature/runSignatureTest.sh
Change-Id: Ied8c3315b29094ad6acee539520af3e4c9e79839
2019-01-22 14:16:12 +00:00
Dan Willemsen
241d7cdba0 Merge "Add previously debug-tagged modules" 2019-01-19 07:39:56 +00:00
Dongwon Kang
167758a153 Move UPDATABLE_BOOT_(MODULES|JARS) to base_system.mk for further extension
Test: build & boot
Bug: 112766913

Change-Id: I5af02d44c4b4163acdc4e3078dcebd84556ee049
2019-01-18 17:06:18 -08:00
Dan Willemsen
ec6cc8521d Add previously debug-tagged modules
These all had `LOCAL_MODULE_TAGS := debug`

Test: treehugger
Change-Id: I848d1d9fb7e9921827ef6b5b72376710150ce839
2019-01-18 15:51:41 -08:00
Treehugger Robot
0a8750b3da Merge "Change the impl lib name of java_sdk_library" 2019-01-17 10:01:37 +00:00
Sundong Ahn
a9f2ef5ed1 Change the impl lib name of java_sdk_library
The impl lib name of java_sdk_library is changed to {module_name}.jar
instead of {module_name}.impl.jar

Bug: 110404779
Test: m -j
Change-Id: I275cd40e3682640b96425e56698cea770888cbb1
Merged-In: I275cd40e3682640b96425e56698cea770888cbb1
(cherry picked from commit 0372f189ac)
2019-01-17 09:42:57 +09:00
Anton Hansson
3fc20bd7d9 Merge "Add webview to mainline whitelist" 2019-01-16 16:31:50 +00:00
Treehugger Robot
0735b4f9fe Merge "Split *_product makefiles" 2019-01-16 15:18:37 +00:00
SzuWei Lin
caa5e88d4a Split *_product makefiles
So far, we have *_system.mk and *_vendor.mk.
This patch split all product settings from *_vendor.mk to new
*_product.mk

This patch also create a new telephony.mk to include all
telephony_*.mk

Bug: 119747870
Test: lunch mainline_arm64-user; make -j
Test: compare the content with and without the patch
Test: the output files in out folder are the same
Change-Id: I79aefdd1971b3b5724a3ec858de4109b645c765a
Merged-In: I79aefdd1971b3b5724a3ec858de4109b645c765a
2019-01-16 22:23:35 +08:00
Anton Hansson
0a5d5fec2e Add webview to mainline whitelist
The app will move to product soon, but temporarily
whitelist that mainline_arm64 adds it to /system.

Test: make
Change-Id: I7b0ce5623a160bcb0f8b89f3053a007019ff0b62
2019-01-16 13:31:02 +00:00
Anton Hansson
e7f127491a Merge "Remove webview from media_system.mk" 2019-01-16 09:44:39 +00:00