Commit Graph

3936 Commits

Author SHA1 Message Date
Anton Hansson 19fc0e3c2b Remove core.mk.
It only has one mk inheriting it now, so it's redundant. Push its
packages into the single child (generic_no_telephony.mk).

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
Merged-In: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
(cherry picked from commit 57000e3c79)
2018-06-20 14:42:30 +01:00
Anton Hansson 52b38791b7 Remove sdk_base.mk.
Not used anymore, and it's in pretty bad shape, so delete it.

Bug: 80410283
Test: N/A.
Change-Id: I1353aa24024ece38857be6b489d36b0a612355cb
Merged-In: I1353aa24024ece38857be6b489d36b0a612355cb
(cherry picked from commit f65e806618)
2018-06-20 14:42:02 +01:00
bohu 68606832c0 emulator: add host tools to sdk_phone_x86/64
Fix sdk_x86-sdk build breakage that requires host tools.

BUG: 109716817
Test: make -j110 PRODUCT-sdk_x86-sdk showcommands dist DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk/4821124 sdk_repo
Change-Id: I7b0b4d0e3b2c79bad305bc11a5c1d04eb1f2bdd1
Merged-In: I7b0b4d0e3b2c79bad305bc11a5c1d04eb1f2bdd1
(cherry picked from commit 62d494b3fd)
2018-06-20 14:34:50 +01:00
Anton Hansson 57000e3c79 Remove core.mk.
It only has one mk inheriting it now, so it's redundant. Push its
packages into the single child (generic_no_telephony.mk).

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
Merged-In: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
(cherry picked from commit d0d862d794)
2018-06-20 13:18:00 +00:00
Anton Hansson f65def6aa9 Remove sdk_base.mk.
Not used anymore, and it's in pretty bad shape, so delete it.

Bug: 80410283
Test: N/A.
Change-Id: I1353aa24024ece38857be6b489d36b0a612355cb
Merged-In: I1353aa24024ece38857be6b489d36b0a612355cb
(cherry picked from commit f65e806618)
2018-06-20 13:14:48 +00:00
bohu 1829eb172e emulator: base sdk_phone_x86/64 images on aosp
BUG: 79941736

this cl only impacts emulator images

Test: lunch sdk_phone_x86; m; emulator boots
Change-Id: I63bc56ba69d313515ec3a1c73206f9a125a697ab
Merged-In: I63bc56ba69d313515ec3a1c73206f9a125a697ab
(cherry picked from commit c5e25e9b84)
2018-06-20 14:11:32 +01:00
Bo Hu c2c164504d Merge "Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp"""
am: 9379de6756

Change-Id: Ibe57c92bbccbc8f8b9bdf87f87cca32880a3073c
2018-06-20 01:14:00 -07:00
Dan Willemsen 5250840358 aosp_x86_arm builds have overriding commands
This product has warnings about overriding build commands, which means
that there are multiple instructions on how to build a file, and we've
just picked one of them. Which one we pick is usually stable, but it can
change.

Bug: 77611511
Test: turn default to false, aosp_x86_arm still uses a warning
Change-Id: Id821c04e3dd6a1f69ea748827c3570a751b4e1dd
2018-06-19 23:25:16 -07:00
bohu 19481ce902 Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp""
This reverts commit c82af2f6a9.

Change-Id: I62ce24e5b58b15b0c9026ebfea23860ec2f9bfae
2018-06-19 21:32:05 -07:00
Bo Hu 31e612afb3 Merge "Revert "emulator: base sdk_phone_armv7/64 on aosp""
am: 6291a4a258

Change-Id: I9f78612d267d8663489d17524aebedffc0ec7c71
2018-06-19 15:41:39 -07:00
Bo Hu c82af2f6a9 Revert "emulator: base sdk_phone_armv7/64 on aosp"
This reverts commit b12abf0310.

Reason for revert: broke sdk build

Change-Id: Ib04df196806488245259f797eb9f52e61f337715
2018-06-19 22:19:47 +00:00
Bo Hu 2ed87d0137 Merge "emulator: base sdk_phone_armv7/64 on aosp"
am: 5ce1e519ea

Change-Id: I9284449872882da56972e8b740bd6043746f1984
2018-06-19 13:45:04 -07:00
bohu b12abf0310 emulator: base sdk_phone_armv7/64 on aosp
Switch to GSI images for arm/arm64 sdk images.

BUG: 79941736

This cl does not impact real device images

Test: make -j110 PRODUCT-sdk_phone_armv7-sdk showcommands dist \
DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk sdk_repo

Change-Id: Ia50be068cc5e5307cdf7ee3a8e11014ed8019992
Merged-In: Ia50be068cc5e5307cdf7ee3a8e11014ed8019992
2018-06-19 11:51:31 -07:00
Makoto Onuki cd20160644 atest: switch from a shell function to binary
Test: m -j, do envsetup.sh in a clean shell, run atest
Change-Id: I868d24176538397a592d20a4d5082170b91c9ae4
Merged-In: I868d24176538397a592d20a4d5082170b91c9ae4
2018-06-19 11:38:15 -07:00
Anton Hansson dbe194f472 Delete core_tiny.mk
Only inherited by a single mk, so inline its contents there, with a few
exceptions:
- pppd was redundant (already in base)
- ContactsProvider and DefaultContainerService were duped in base.mk's
  only two children (core_tiny and core_minimal)

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I95431b3db789e9c347bb37109a3ac7f627025f96
Merged-In: I95431b3db789e9c347bb37109a3ac7f627025f96
2018-06-19 14:01:10 +00:00
Anton Hansson 32e70da517 Remove embedded.mk
The common mk files form a long chain of generic sounding names that
don't make much sense. For instance, embedded, base, core_minimal, core
and core_base all inherit each other, but there's no logical ordering
of these names.

The common mks will be split based on destination partition, which will
create many new files. Merging some of the common ones before this split
keeps the total number of mks under control.

There are only 2 products inheriting this mk excluding base.mk (which
has over 300 descendants). The other levels in the hierarchy all have
multiple device categories rooted at them (e.g. wearables from base.mk,
tvs and cars from core_minimal.mk), but embedded.mk has not which
makes it a compelling target to remove.

Bug: 80410283
Test: diff products variables with multiproduct_kati
Change-Id: I35c05973dfefefb7a31686476215386b8b89a557
Merged-In: I35c05973dfefefb7a31686476215386b8b89a557
Merged-In: I2e25032645c87f084f911e14fade16bc802ff457
2018-06-19 10:40:01 +00:00
Anton Hansson d88565085c Remove embedded.mk
The common mk files form a long chain of generic sounding names that
don't make much sense. For instance, embedded, base, core_minimal, core
and core_base all inherit each other, but there's no logical ordering
of these names.

The common mks will be split based on destination partition, which will
create many new files. Merging some of the common ones before this split
keeps the total number of mks under control.

There are only 2 products inheriting this mk excluding base.mk (which
has over 300 descendants). The other levels in the hierarchy all have
multiple device categories rooted at them (e.g. wearables from base.mk,
tvs and cars from core_minimal.mk), but embedded.mk has not which
makes it a compelling target to remove.

Bug: 80410283
Test: diff products variables with multiproduct_kati
Change-Id: I35c05973dfefefb7a31686476215386b8b89a557
Merged-In: I35c05973dfefefb7a31686476215386b8b89a557
2018-06-18 11:54:25 +00:00
Treehugger Robot 7f0ac95d21 Merge "Set proper CPU variant for aosp_arm" 2018-06-15 20:19:10 +00:00
Isaac Chen e44b0d96b9 Set proper CPU variant for aosp_arm
System image of aosp_arm products is the new GSI in Pi.
Its arch variants need to be the same as the legacy GSI built
with aosp_arm_ab so it can pass related CTS/VTS tests.

Bug: 80401108
Test: $ lunch aosp_arm-userdebug; m -j; emulator # booted OK
      $ lunch aosp_arm-userdebug; m -j cts

Change-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
Merged-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
(cherry picked from commit b2e58893c3)
2018-06-15 18:40:42 +00:00
Anton Hansson 984e93a450 Merge "Move a few packages from core_minimal.mk to base.mk." 2018-06-15 09:08:33 +00:00
Anton Hansson 667d543f87 Merge "Move a few packages from core_minimal.mk to base.mk." into stage-aosp-master 2018-06-15 09:07:30 +00:00
Sundong Ahn b4cb1b542a Merge "Remove com.android.location.provider.xml"
am: 1ce8617482

Change-Id: I56c7f2d883b00812b92b43e318548bbba4855eb2
2018-06-14 21:52:54 -07:00
Treehugger Robot 1ce8617482 Merge "Remove com.android.location.provider.xml" 2018-06-15 03:41:18 +00:00
Anton Hansson 446d9a8cad Move a few packages from core_minimal.mk to base.mk.
All the products that inherit from base.mk add these packages, so moving
them up the hierarchy eliminates some duplication.

    DownloadProvider
    idmap
    libneuralnetworks
    mdnsd
    MediaProvider

Bug: 80410283
Test: diff all product variables with multiproduct_kati
Change-Id: I133a385b3bc64261d73f616c416f7a905675c09d
Merged-In: I133a385b3bc64261d73f616c416f7a905675c09d
2018-06-14 15:43:42 +00:00
Anton Hansson be371e1656 Move a few packages from core_minimal.mk to base.mk.
All the products that inherit from base.mk add these packages, so moving
them up the hierarchy eliminates some duplication.

    DownloadProvider
    idmap
    libneuralnetworks
    mdnsd
    MediaProvider

Bug: 80410283
Test: diff all product variables with multiproduct_kati
Change-Id: I133a385b3bc64261d73f616c416f7a905675c09d
Merged-In: I133a385b3bc64261d73f616c416f7a905675c09d
2018-06-14 16:39:17 +01:00
Anton Hansson f93d674ac3 Merge "Dedupe packages in mk's that inherit core_minimal.mk" 2018-06-14 07:57:52 +00:00
Sundong Ahn 8970f61d99 Remove com.android.location.provider.xml
The com.android.location.provider.xml is removed from the
PRODUCT_PACKAGES, because xml files will be generated and installed by
soong.

Bug:77577799
Test: make -j
Change-Id: Idfbc6b09ca4337795277df8b98c73f6fd5865aff
2018-06-14 11:15:20 +09:00
Jiyong Park 1d46a3395f Merge "Support shared library in recovery mode"
am: 2371a7d60e

Change-Id: I1e4520c8a2663476bd3924aeca1cf5183240dbf7
2018-06-13 16:38:49 -07:00
Treehugger Robot 2371a7d60e Merge "Support shared library in recovery mode" 2018-06-13 23:14:29 +00:00
Bo Hu 82de42067e Merge "emulator: move sepolicy to goldfish project" 2018-06-13 22:14:32 +00:00
bohu 4abeb75f32 emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
Merged-In: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 12:45:47 -07:00
bohu 4001858313 emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
Merged-In: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 18:37:16 +00:00
Treehugger Robot 59c5127bea Merge "Create system.prop for GSI Pi" 2018-06-13 17:48:06 +00:00
Jiyong Park 53acaeab0a Support shared library in recovery mode
The dyanmic linker and the linker config script for the recovery mode
(*.recovery variants) are added to PRODUCT_PACKAGES.

Also this removes the mountpoint /system_root from the recovery image as the
recovery image is self-contained and the real system image is mounted at
/mnt/system which is created automatically at runtime.

Bug: 63673171
Test: `adb reboot recovery; adb devices` shows the device ID
Test: Select 'mount /system' in the recovery mode, then `adb shell`.
$ lsof -p `pidof adbd` shows that libm.so, libc.so, etc. are loaded from
the /lib directory.

Change-Id: Ice6c75b0b81bb9be696aaff3e095d87f19278995
2018-06-14 02:03:57 +09:00
Anton Hansson abf60f5526 Dedupe packages in mk's that inherit core_minimal.mk
The following packages are moved up one level, into core_minimal.mk
as all its descendants in master share them:
    ContactsProvider
    DefaultContainerService
    libaudiopreprocessing
    libfilterpack_imageproc
    libgabi++
    libstagefright_soft_aacdec
    libstagefright_soft_aacenc
    libstagefright_soft_amrdec
    libstagefright_soft_amrnbenc
    libstagefright_soft_amrwbenc
    libstagefright_soft_avcdec
    libstagefright_soft_avcenc
    libstagefright_soft_flacdec
    libstagefright_soft_flacenc
    libstagefright_soft_g711dec
    libstagefright_soft_gsmdec
    libstagefright_soft_hevcdec
    libstagefright_soft_mp3dec
    libstagefright_soft_mpeg2dec
    libstagefright_soft_mpeg4dec
    libstagefright_soft_mpeg4enc
    libstagefright_soft_opusdec
    libstagefright_soft_rawdec
    libstagefright_soft_vorbisdec
    libstagefright_soft_vpxdec
    libstagefright_soft_vpxenc
    mdnsd
    requestsync

Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Ic38f7aea3e865dbd9f170925214e3dea5233e61e
2018-06-13 07:44:00 +00:00
Bjoern Johansson 2bfb5627ea Merge "Support new hostapd build target without HIDL"
am: acbfc3fb94

Change-Id: I13bc909b0ba2204703ccc166ae17624efe8ab3d5
2018-06-12 17:12:15 -07:00
Anton Hansson f42afaf2a2 resolve merge conflicts of 2ab7fe2fe5 to stage-aosp-master
BUG: None
Test: git diff origin/pi-dev-plus-aosp is empty
Change-Id: Ib99471ae197d753efeeb17be95edbd72326f1358
Merged-In: Iddffd6982df039f5daa8be345de338ba11c63c10
2018-06-12 16:09:49 +01:00
Anton Hansson 5c1dc143cd Dedupe packages in mk's that inherit core_minimal.mk
The following packages are moved up one level, into core_minimal.mk
as all its descendants in master share them:
    ContactsProvider
    DefaultContainerService
    libaudiopreprocessing
    libfilterpack_imageproc
    libgabi++
    libstagefright_soft_aacdec
    libstagefright_soft_aacenc
    libstagefright_soft_amrdec
    libstagefright_soft_amrnbenc
    libstagefright_soft_amrwbenc
    libstagefright_soft_avcdec
    libstagefright_soft_avcenc
    libstagefright_soft_flacdec
    libstagefright_soft_flacenc
    libstagefright_soft_g711dec
    libstagefright_soft_gsmdec
    libstagefright_soft_hevcdec
    libstagefright_soft_mp3dec
    libstagefright_soft_mpeg2dec
    libstagefright_soft_mpeg4dec
    libstagefright_soft_mpeg4enc
    libstagefright_soft_opusdec
    libstagefright_soft_rawdec
    libstagefright_soft_vorbisdec
    libstagefright_soft_vpxdec
    libstagefright_soft_vpxenc
    mdnsd
    requestsync

Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Ic38f7aea3e865dbd9f170925214e3dea5233e61e
Merged-In: Ic38f7aea3e865dbd9f170925214e3dea5233e61e
2018-06-12 15:25:06 +01:00
Treehugger Robot acbfc3fb94 Merge "Support new hostapd build target without HIDL" 2018-06-12 12:49:49 +00:00
Bo Hu 41e2fd3dd8 Merge "emulator: update aosp sepolicies" 2018-06-12 12:49:43 +00:00
SzuWei Lin 326ad779c1 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
Merged-In: I435e33558e244009af9a91a97580fd56591ff6f3
(cherry picked from commit 3fc49fede8)
2018-06-12 18:03:31 +08:00
Bjoern Johansson a53c522678 Support new hostapd build target without HIDL
The new build target for hostapd does not include the HIDL control
interface and it's a separate binary from the hostapd used for WiFi
hotspots. This new binary needs its own SELinux rules and it should be
included in emulator builds since it's used to provide virtual access
points.

BUG: 74401469
Test: run cts -m CtsNetTestCases
Change-Id: I6a654ac2dea20af048ac731876ac603773fcf3d8
2018-06-11 15:56:51 -07:00
bohu 3a83195522 emulator: update aosp sepolicies
There have been quite some changes that should go to aosp.
This CL squash all of them into a single one.

Change-Id: I1e8d172b99cc98c93f2925fef32da8b461c277ed
Merged-In: I93b8489f710d194917d4b482ebca960c39658fd9
Merged-In: Ifac85db4e13d0b946f91b7eeffb4288d40d0ebb8
2018-06-11 15:56:25 -07:00
Anton Hansson 9f7cc0d0ab Dedupe mk rules in core_minimal.mk and core_tiny.mk.
These two are the only ones inheriting base.mk, and were largely similar.
This CL moves all the shared stuff up one level into base.mk.

One thing not de-duped yet is the PRODUCT_SYSTEM_SERVER_JARS variable,
as the order of that is significant.

Also sort various lists that were ordered arbitrarily.

Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Iddffd6982df039f5daa8be345de338ba11c63c10
Merged-In: Iddffd6982df039f5daa8be345de338ba11c63c10
2018-06-11 15:18:01 +01:00
Justin Yun 5d8dd1656b Merge "Include VNDK snapshot for 32 bit binder"
am: e59bb32cb7

Change-Id: Ia0b6864fcf44930003f687d2849d970e67ea49df
2018-06-10 18:54:58 -07:00
Treehugger Robot e59bb32cb7 Merge "Include VNDK snapshot for 32 bit binder" 2018-06-11 01:49:02 +00:00
Xin Li c8e90b5da3 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: I06ede5004b16e1ac0bb5c1c6a225c3c307bd26d1
2018-06-08 11:06:45 -07:00
Anton Hansson e91269dc65 Merge "Remove redundant package includes from makefiles." 2018-06-08 14:20:50 +00:00
Justin Yun 6c52bb0d33 Include VNDK snapshot for 32 bit binder
Use the VNDK sanpshot that matches the version of the target binder.

Bug: 74362637
Bug: 80450527
Test: m -j vndk_snapshot_package
Change-Id: I7d540654c9554f9d8a1feaec5eb441389d3960cb
2018-06-08 06:19:44 +00:00
Bo Hu 23508266a8 Merge "emulator: allows vendor_init to set qemu_props" into pi-dev
am: 8e2f247ca1

Change-Id: Ifac85db4e13d0b946f91b7eeffb4288d40d0ebb8
2018-06-07 21:05:49 -07:00
Bo Hu 8e2f247ca1 Merge "emulator: allows vendor_init to set qemu_props" into pi-dev 2018-06-08 02:48:22 +00:00
Yao Chen 59caa14c2d Merge "Add a system property to indicate if statsd should start" into pi-dev
am: 50e6c49020

Change-Id: Ia55a4541f3f7a24f88c41dc79479767719281127
2018-06-07 14:54:27 -07:00
Yao Chen 50e6c49020 Merge "Add a system property to indicate if statsd should start" into pi-dev 2018-06-07 21:10:15 +00:00
bohu 7cdfd674d5 emulator: allows vendor_init to set qemu_props
BUG: 109872686

this cl only impacts emulator images

Change-Id: I93b8489f710d194917d4b482ebca960c39658fd9
2018-06-07 09:19:19 -07:00
Treehugger Robot 7cf113d7dd Merge "Remove com.android.mediadrm.signer.xml" 2018-06-07 11:27:25 +00:00
SzuWei Lin 24279f7678 Merge "Remove AB update in GSI" into pi-dev
am: ff48801c0d

Change-Id: I1de8229fe80f8e753d191c18e6d3a51d9c573ade
2018-06-06 21:06:16 -07:00
TreeHugger Robot ff48801c0d Merge "Remove AB update in GSI" into pi-dev 2018-06-07 03:34:12 +00:00
TreeHugger Robot d40d7f271e Merge "Remove com.android.mediadrm.signer.xml" into pi-dev-plus-aosp 2018-06-07 01:20:04 +00:00
Yao Chen b76f355f4e Add a system property to indicate if statsd should start
Bug: 79324611
Test: manually tested on marlin_svelte
Change-Id: Id0becd80bd58806b674ac60903bad7fd39d7594b
2018-06-06 17:22:57 -07:00
Sunny Goyal 02af579574 Changing the default launcher and recents implementation for system build
am: 47acd31f57

Change-Id: I9a57cc92b8edfbe19ec8b5946ce43a5223ec8f59
2018-06-06 13:24:11 -07:00
SzuWei Lin 3905b85c0a Remove AB update in GSI
Bug: 80554868
Test: Boot a pixel device with GSI applied the patch
Change-Id: If37fa2e6c2909705492863788c222b954e784741
2018-06-06 18:02:27 +08:00
Treehugger Robot f1a5557164 Merge "Temporarily whitelisting system domains writing vendor props" 2018-06-06 03:54:11 +00:00
Sunny Goyal 47acd31f57 Changing the default launcher and recents implementation for system build
Bug: 77490347
Test: Build and flashed system image
Change-Id: I71dbd7eb731c70656bb816848027626b2c7430cc
2018-06-05 21:15:06 +00:00
Isaac Chen 6393783898 Merge "Set proper CPU variant for aosp_arm" into pi-dev
am: b2a5515585

Change-Id: I6f38dd1fbec1192d09cbe434650a8b4292c30315
2018-06-05 11:44:52 -07:00
TreeHugger Robot b2a5515585 Merge "Set proper CPU variant for aosp_arm" into pi-dev 2018-06-05 18:34:41 +00:00
Jeff Vander Stoep 72464c2c66 Merge "sepolicy: update OWNERS" am: 99a215f3db
am: d0be836bbb

Change-Id: I8dec02ad756ca70fbd059f796d4ffb98515c6cb2
2018-06-05 07:58:06 -07:00
bohu 3a036555e7 emulator: add host tools to sdk_phone_x86/64
am: 62d494b3fd

Change-Id: I530cbbe1cb59cc7397ac2dd14235fde0a25f1f04
2018-06-05 06:46:07 -07:00
Anton Hansson b2efa69c98 Remove redundant package includes from makefiles.
These packages are all included in other makefiles in the include
hierarchy:
- atrace, libdl, libtuils are in embedded.mk
- pppd is in base.mk

Bug: 80410283
Test: None
Change-Id: Id00e1af58f2db57090e89348a19c9b1ee7e3311a
2018-06-05 11:36:29 +01:00
bohu 62d494b3fd emulator: add host tools to sdk_phone_x86/64
Fix sdk_x86-sdk build breakage that requires host tools.

BUG: 109716817
Test: make -j110 PRODUCT-sdk_x86-sdk showcommands dist DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk/4821124 sdk_repo
Change-Id: I7b0b4d0e3b2c79bad305bc11a5c1d04eb1f2bdd1
2018-06-05 00:01:36 -07:00
Jeff Vander Stoep 8d235ecb49 sepolicy: update OWNERS
Test: n/a
Change-Id: I905b099c66e44468ca342bcbfe3dcb4dd44071a9
2018-06-04 22:10:54 -07:00
bohu 69e300dc79 emulator: base sdk_phone_x86/64 images on aosp
am: c5e25e9b84

Change-Id: I46e10d2d94aecaa07e49d76b1e808582bbeb6b43
2018-06-04 16:55:02 -07:00
huans c3710cbd95 Merge "Clean up deprecated properties. Set sepolicy for vendor process" into pi-dev
am: cd42897025

Change-Id: Icfb2831128ea7777efc1216e30157f43631e16b6
2018-06-04 14:29:44 -07:00
bohu c5e25e9b84 emulator: base sdk_phone_x86/64 images on aosp
BUG: 79941736

this cl only impacts emulator images

Change-Id: I63bc56ba69d313515ec3a1c73206f9a125a697ab
2018-06-04 14:11:55 -07:00
huans 360eb865ed Clean up deprecated properties. Set sepolicy for vendor process
Bug: 79941736
Test: Manually
Change-Id: Ia7ec0d90be1dbce402b8b6b52762c7384c0d5e1e
2018-06-04 11:02:12 -07:00
Bo Hu deec5c304c Merge changes from topic "emulator-gsi-configs" into pi-dev
am: 63762bdf41

Change-Id: Ia25fa1eeebb37e43ddf360f56f0c77c87c1892f0
2018-06-04 10:23:04 -07:00
Yahan Zhou d681493d4d Merge "Add broadcast radio service for emulator" into pi-dev
am: 52f964deb6

Change-Id: I6d7f4cf73718db5faa25f0bcd40a2b7bd9244083
2018-06-04 10:03:49 -07:00
Bo Hu 63762bdf41 Merge changes from topic "emulator-gsi-configs" into pi-dev
* changes:
  Update the rild.libpath to vendor.rild.libpath for aosp_$arch
  emulator:  add missing apns config
2018-06-04 16:29:36 +00:00
TreeHugger Robot 52f964deb6 Merge "Add broadcast radio service for emulator" into pi-dev 2018-06-04 13:45:18 +00:00
Sundong Ahn b87bdedba5 Remove com.android.mediadrm.signer.xml
The com.android.mediadrm.signer.xml is removed from the
PRODUCT_PACKAGES, because xml files will be generated and installed by
soong.

Bug:77577799
Test: make -j
Merged-In: Icd19b896c92b347e0452c5bfb21a331e727a4f08
Change-Id: Icd19b896c92b347e0452c5bfb21a331e727a4f08
(cherry picked from commit b2d6b3bcf2)
2018-06-01 15:27:44 +09:00
Sundong Ahn 090fd0c165 Remove com.android.mediadrm.signer.xml
The com.android.mediadrm.signer.xml is removed from the
PRODUCT_PACKAGES, because xml files will be generated and installed by
soong.

Bug:77577799
Test: make -j
Merged-In: Icd19b896c92b347e0452c5bfb21a331e727a4f08
Change-Id: Icd19b896c92b347e0452c5bfb21a331e727a4f08
(cherry picked from commit b2d6b3bcf2)
2018-05-31 20:17:34 +09:00
Isaac Chen b2e58893c3 Set proper CPU variant for aosp_arm
System image of aosp_arm products is the new GSI in Pi.
Its arch variants need to be the same as the legacy GSI built
with aosp_arm_ab so it can pass related CTS/VTS tests.

Bug: 80401108
Test: $ lunch aosp_arm-userdebug; m -j; emulator # booted OK
      $ lunch aosp_arm-userdebug; m -j cts

Change-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
2018-05-31 10:01:08 +08:00
huans ae665f0833 Update the rild.libpath to vendor.rild.libpath for aosp_$arch
bug: 80137441

Test: build and runaosp_x86-userdebug. adb logcat -b radio.
check the rild read the right property vendor.rild.libpath

Change-Id: I0529c32b79cf791821d71369bcd0fb244c13361c
2018-05-30 14:48:31 -07:00
huans 3d31afe594 emulator: add missing apns config
We add goldfish specific apns config files to /data/misc/apns/etc/
for aosp_* targets to have working telephony and wifi.

BUG: 79584197
Change-Id: I46591d923496420212cd279c0b90f0b4eb11cea4
2018-05-30 14:48:25 -07:00
SzuWei Lin 494d2fe97b Enable metadata in GSI
am: 5d356e2397

Change-Id: I2086d56e42b2318a8080d16f13d48c9ee4a23bf1
2018-05-30 11:05:42 -07:00
SzuWei Lin 5d356e2397 Enable metadata in GSI
Add BOARD_USES_METADATA_PARTITION to GSI to enable metadata folder
under the root folder.

Bug: 80407843
Bug: 79781913
Test: Boot on a Pixel device with GSI applied the patch
Change-Id: I5544b76b54300aa5a87aa4fa3c0ec6feff13a554
2018-05-30 17:01:49 +08:00
Vishwath Mohan 7bfd882a23 Apply CFI include paths to all product configs.
am: f8d4dc5787

Change-Id: I62739ecb272c088d7468b7bdf47bf923a42be079
2018-05-29 16:36:09 -07:00
Vishwath Mohan f8d4dc5787 Apply CFI include paths to all product configs.
The current VNDK ABI snapshot expects that CFI is disabled for
components that either in the include paths (from cfi-common.mk) OR
enabled directly in the makefile/blueprint. However, on non-arm64
architectures, the build system was only disabling CFI for vendor
components in the include paths.

This topic corrects it by (a) removing the include paths check to disable
CFI for vendor variants, and (b) inheriting the CFI include paths in
all product configs to ensure that when we update the ABI we're able
to move to relying exclusively on (PRODUCT_)CFI_INCLUDE_PATHS.

Bug: 66301104
Test: ABI matches for all architectures.
Change-Id: I4d845cd9925354d565e06020c479cc3f7ab28f61
2018-05-28 13:51:05 -07:00
Yahan Zhou 6d6d4702d5 Add broadcast radio service for emulator
This cl does not impact real devices.

BUG: 79750456

Test: atest VtsHalBroadcastradioV1_0Target
Change-Id: I6fac31902a8414e550b9053b6985f818674b3e9d
2018-05-25 22:16:26 +00:00
Vishwath Mohan 118025a161 Enable CFI for vendor components on aosp_arm64_ab product-configs
am: 014d1fc969

Change-Id: I3c9c6ece3cdb1abe3a06c7803dd0bbf5310d9acb
2018-05-25 10:44:33 -07:00
Vishwath Mohan 014d1fc969 Enable CFI for vendor components on aosp_arm64_ab product-configs
The aosp_arm64_ab product config needs to also enable CFI for some
vendor components (if they exist).

Bug: 66301104
Test: lunch aosp_arm64_ab-userdebug && m -j40
Change-Id: Iae670c2d44c00d3dfb0e312e1492b37bbb737d4f
2018-05-25 07:01:09 -07:00
Vishwath Mohan 088506c303 Merge "Enable CFI by default but restrict CFI_INCLUDE_PATHS" into pi-dev
am: d002e49501

Change-Id: I32d21f2dbbbaf4bb7f8a6be033d036ab626cba10
2018-05-25 00:24:49 -07:00
Jiyong Park fbaf8f7530 Merge "Don't copy system/sbin/adbd to recovery" am: 93ca8d3789
am: b771720b24

Change-Id: I29f78cccc259d6a6d1046578f5576ec12ca5be98
2018-05-24 23:15:31 -07:00
Vishwath Mohan 6106a4ead5 Enable CFI by default but restrict CFI_INCLUDE_PATHS
This CL enables CFI on security sensitive components for product
configs that inherit core_64_bit.mk (and core_64_bit_only.mk). Note
that this only requests the build system to do so. Internal build
logic will dictate if this is actually enabled on the build or
not (CFI is currently disabled for ARM32 and MIPS for example).

In addition, this also restricts CFI_INCLUDE_PATHS and
PRODUCT_CFI_INCLUDE_PATHS to Arm64 architectures only. This helps
narrow which targets enable CFI out of the box.

Bug: 66301104
Test: CFI is enabled on aosp_* targets
Change-Id: I52af499dc34cd4b42fbfb1175f6a37aaf17b65dd
2018-05-24 22:14:03 -07:00
Ruchi Kandoi 58cd1455fc Adds SecureElement apk to core_minimal.mk and core_tiny.mk
am: 2dcba6fed7

Change-Id: Ibc87a96a784b45f2f23dc1731c9b1016b05b8089
2018-05-24 17:31:16 -07:00
Ruchi Kandoi 2dcba6fed7 Adds SecureElement apk to core_minimal.mk and core_tiny.mk
Bug: 79999791
Bug: 80000595
Test: CtsOmapiTestCases; works on phones/tablets, needs to be
verified on wearables
Change-Id: I114b9d02097e880d8369b75790fae5b995db8e59
2018-05-24 21:57:03 +00:00
Jiyong Park 6b79c9b769 Temporarily whitelisting system domains writing vendor props
system properties must not be used as a communication channel in between
system and vendor processes. However, there has been no enforcement on
this: system process could write system properties that are owned and
read by vendor processes and vice versa. Such communication should be
done over hwbinder and should be formally specified in HIDL.

Until we finish migrating the existing use cases of sysprops to HIDL,
whitelisting them in system_writes_vendor_properties_violators so that
the violators are clearly tracked.

These violators are allowed only for P, but not for Q.

Bug: 78598545
Test: m -j selinux_policy when choosecombo'ed to aosp_arm64
Merged-In: I8f66aa20bb2d926cf517d40c93f4300c4d16b04b
Change-Id: I8f66aa20bb2d926cf517d40c93f4300c4d16b04b
(cherry picked from commit bb1432b61b)
2018-05-24 19:03:25 +09:00
Jiyong Park ce3e34f6ac Don't copy system/sbin/adbd to recovery
adbd for recovery partition is built separately. No need to copy.
Instead, the recovery version adbd.recovery is added to
PRODUCT_PACKAGES.

Bug: 79146551
Test: m -j
Test: adb reboot recovery; adb devices
Change-Id: I7f0ee8b21cbafc0ab5a4eb1f9c8ee70774617013
2018-05-24 18:19:49 +09:00
Hung-ying Tyan 38b5df5add Merge "configstore: uprevisioned to 1.1" into pi-dev
am: 76c6cf247e

Change-Id: Iad9d5a54f74782397bc369d466c2f0dabb092090
2018-05-23 18:19:15 -07:00
TreeHugger Robot 76c6cf247e Merge "configstore: uprevisioned to 1.1" into pi-dev 2018-05-24 00:50:19 +00:00
Vishwath Mohan 158a6d7d44 Enable CFI for the aosp_arm64_ab product config.
am: 0784f0eaf5

Change-Id: I0e1fed4a025c08a4d51cddcc9340f1b4f5a5d6a9
2018-05-23 14:11:19 -07:00
Hung-ying Tyan 497175eb4d configstore: uprevisioned to 1.1
Bug: 69691076
Test: build and boot on walleye
Change-Id: I5ba2d3c3712147d09eb74c3d2db5dd0d6c24e707
2018-05-23 10:45:40 -07:00
Jiyong Park 68ad8057d7 Merge changes from topic "java_sdk_library"
* changes:
  org.apache.http.legacy.boot is renamed to org.apache.http.legacy.impl
  use the phony module name to install org.apache.http.legacy
2018-05-23 11:35:25 +00:00
TreeHugger Robot cb04d86495 Merge changes from topic "java_sdk_library" into pi-dev-plus-aosp
* changes:
  org.apache.http.legacy.boot is renamed to org.apache.http.legacy.impl
  use the phony module name to install org.apache.http.legacy
2018-05-23 09:52:16 +00:00
Vishwath Mohan 0784f0eaf5 Enable CFI for the aosp_arm64_ab product config.
This CL enables CFI for the aosp_arm64_ab product config - which helps
ensure that the VNDK ABI is consistent with product configs that
also enable CFI.

Bug: 66301104
Test: VNDK ABI is consistent with walleye-userdebug
Change-Id: I8ba1f8ebc475a91e9c2a527c813e3c5e1daae897
2018-05-23 01:43:18 +00:00
Narayan Kamath 37f1ccacc5 Merge "core: Remove explicit libpac dependency." am: 62f6c1802e
am: 266bbad27d

Change-Id: I44f407f3590e0d837e6af38401794c05789da29c
2018-05-22 07:35:04 -07:00
Treehugger Robot 62f6c1802e Merge "core: Remove explicit libpac dependency." 2018-05-22 12:24:33 +00:00
Jiyong Park 565ec59f1f org.apache.http.legacy.boot is renamed to org.apache.http.legacy.impl
The name of the runtime library name for the SDK library
org.apache.http.legacy has changed to org.apache.http.legacy.impl as it
is now built using java_sdk_library construct where *.impl suffix is
automatically added to the runtime lib.

Bug: 77577799
Test: m -j
Merged-In: Ie049d06d78cc403454c2885def88a167975b4204
Change-Id: Ie049d06d78cc403454c2885def88a167975b4204
(cherry picked from commit 7f9a1a49cf)
2018-05-22 20:37:30 +09:00
Jiyong Park 2317cf5e6e use the phony module name to install org.apache.http.legacy
org.apache.http.legacy.boot which is the runtime library for
org.apache.http.legacy API is now renamed to org.apache.http.legacy.impl
as a result of migration to java_sdk_library.

Installing the runtime library can now be done via the sdk lib name
(org.apache.http.legacy) which internally includes the .impl runtime
lib.

Bug: 77577799
Test: m -j
Test: device boots to the UI. No error related to org.apache.http.legacy
shown in the logcat log.
Test: adb shell cmd package list libraries | grep http shows the
library.

Merged-In: I224bc0f8c58958240130aa7874851ecfdf6f7317
Change-Id: I224bc0f8c58958240130aa7874851ecfdf6f7317
(cherry picked from commit 6ac30d5270)
2018-05-22 20:34:42 +09:00
Jiyong Park c98eb5b5b8 org.apache.http.legacy.boot is renamed to org.apache.http.legacy.impl
The name of the runtime library name for the SDK library
org.apache.http.legacy has changed to org.apache.http.legacy.impl as it
is now built using java_sdk_library construct where *.impl suffix is
automatically added to the runtime lib.

Bug: 77577799
Test: m -j
Merged-In: Ie049d06d78cc403454c2885def88a167975b4204
Change-Id: Ie049d06d78cc403454c2885def88a167975b4204
(cherry picked from commit 7f9a1a49cf)
2018-05-22 20:13:30 +09:00
Jiyong Park d0ee38b43a use the phony module name to install org.apache.http.legacy
org.apache.http.legacy.boot which is the runtime library for
org.apache.http.legacy API is now renamed to org.apache.http.legacy.impl
as a result of migration to java_sdk_library.

Installing the runtime library can now be done via the sdk lib name
(org.apache.http.legacy) which internally includes the .impl runtime
lib.

Bug: 77577799
Test: m -j
Test: device boots to the UI. No error related to org.apache.http.legacy
shown in the logcat log.
Test: adb shell cmd package list libraries | grep http shows the
library.

Merged-In: I224bc0f8c58958240130aa7874851ecfdf6f7317
Change-Id: I224bc0f8c58958240130aa7874851ecfdf6f7317
(cherry picked from commit 6ac30d5270)
2018-05-22 20:12:54 +09:00
Logan Chien 0e9b3e9d5a Remove PRODUCT_EXTRA_VNDK_VERSIONS from AOSP
This commit removes PRODUCT_EXTRA_VNDK_VERSIONS from AOSP branches.
prebuilts/vndk/v27 is missing from these branches.

This commit partially reverts
https://android-review.googlesource.com/c/platform/build/+/682124

Bug: 78605339
Test: aosp_arm64_ab-userdebug builds
Change-Id: Ic64f40dab2d7730f6ebcdf124cd069ed3c845e40
Merged-In: Ibae4a393e6e69f26d7a2d493b93e5739f806147b
2018-05-22 13:45:26 +08:00
Jiyong Park 77d665b558 Merge "Temporarily whitelisting system domains writing vendor props" into pi-dev
am: 92267a5d02

Change-Id: I641fbbb0e3efecafbbfdb5d523218a6967961eca
2018-05-21 22:10:49 -07:00
TreeHugger Robot 92267a5d02 Merge "Temporarily whitelisting system domains writing vendor props" into pi-dev 2018-05-22 05:04:40 +00:00
Paul Crowley 00f88c2c1b Merge "Revert "Add metadata/ to aosp_arm64 temporarily"" into pi-dev
am: b1e6c48b26

Change-Id: Id2773f063671e4ebb339657c2184dfb3fae546e8
2018-05-21 13:47:57 -07:00
Paul Crowley 66bad03f08 Revert "Add metadata/ to aosp_arm64 temporarily"
This reverts commit eee6e39145.
Bug: 79781913
Test: Compile for this target.

Change-Id: Ia635c124557ccad6cfef1a8867ca099de6b3f3db
2018-05-21 11:57:16 -07:00
Jiyong Park bb1432b61b Temporarily whitelisting system domains writing vendor props
system properties must not be used as a communication channel in between
system and vendor processes. However, there has been no enforcement on
this: system process could write system properties that are owned and
read by vendor processes and vice versa. Such communication should be
done over hwbinder and should be formally specified in HIDL.

Until we finish migrating the existing use cases of sysprops to HIDL,
whitelisting them in system_writes_vendor_properties_violators so that
the violators are clearly tracked.

These violators are allowed only for P, but not for Q.

Bug: 78598545
Test: m -j selinux_policy when choosecombo'ed to aosp_arm64
Change-Id: I8f66aa20bb2d926cf517d40c93f4300c4d16b04b
2018-05-18 20:16:51 +09:00
Logan Chien 86b52aec24 Build a single GSI for O-MR1-VENDOR and Master-VENDOR
The objective of this commit is to support these 3 combinations:

1. Master-GSI + Master-VENDOR (w/ BOARD_VNDK_VERSION)
2. Master-GSI + Master-VENDOR (w/o BOARD_VNDK_VERSION for upgrading devices)
3. Master-GSI + O-MR1-VENDOR (w/ BOARD_VNDK_VERSION)

This commit defines a new property `ro.vndk.lite` to indicate the status
of BOARD_VNDK_VERSION run-time enforcement.  Now, all devices should
have `ro.vndk.version` so that `libhidlbase.so`, `libRSCpuRef.so`, and
`libnativeloader.so` can find the versioned VNDK directory.

Bug: 78605339
Test: aosp_sailfish Master-SYSTEM + Master-VENDOR boots
Test: aosp_sailfish Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-SYSTEM + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + O-MR1-VENDOR boots
Change-Id: Iee9553b3ca9e0798a873e655d87d10cdc23d4b1c
Merged-In: Iee9553b3ca9e0798a873e655d87d10cdc23d4b1c
(cherry picked from commit d73b94c097)
2018-05-17 14:25:15 +08:00
huans 1dd2190c9b Merge "Add missing emulator vendor contents for treblizing aosp_$arch" into pi-dev
am: 5b870d1583

Change-Id: I62475d640051c3b38eac44c805aee3ea5e3cb31f
2018-05-16 22:07:50 -07:00
huans de55429ad3 Add missing emulator vendor contents for treblizing aosp_$arch
This change only impact emulator images.

Test: Compare the system partition before and after this change,
make sure they are identical.

Bug: 79584197
Test: Boot success.

Change-Id: I00427f663f068cc7ba9984e4facaff1b0c98b17f
2018-05-16 22:02:46 +00:00
SzuWei Lin 4ae7e2bba0 Merge "Add metadata/ to aosp_arm64 temporarily" into pi-dev
am: 8b6eda5f49

Change-Id: Ia8f29e6aaa0e36c4f3305904a06fd65f9ad28b06
2018-05-16 11:50:42 -07:00
TreeHugger Robot 8b6eda5f49 Merge "Add metadata/ to aosp_arm64 temporarily" into pi-dev 2018-05-16 18:43:02 +00:00
SzuWei Lin eee6e39145 Add metadata/ to aosp_arm64 temporarily
FBE needs metadata/ under root folder. Adds metadata to
root folder before it has a final solution.

Bug: 79572884
Test: Boot on some pixel devices + aosp_arm64-userdebug with the patch
Change-Id: I5ef5763b755615dad4c8c711f9c9ef8987d3bb68
2018-05-16 18:32:48 +00:00
Logan Chien 4f03bf9972 Merge "Build a single GSI for O-MR1-VENDOR and Master-VENDOR" into pi-dev
am: aee6e5dd3b

Change-Id: Idbbaac7407175b38882c341b8b4075bd1f2b2152
2018-05-16 02:45:43 -07:00
Logan Chien aee6e5dd3b Merge "Build a single GSI for O-MR1-VENDOR and Master-VENDOR" into pi-dev 2018-05-16 09:38:57 +00:00
Narayan Kamath 8b2380213a core: Remove explicit libpac dependency.
Included via PacProcessor's LOCAL_JNI_SHARED_LIBRARIES

Test: m
Change-Id: I970fcd1554954f3f5b05fddd0cab86bc90d86f9e
2018-05-15 11:27:34 +01:00
Isaac Chen e28dc89ca8 Merge "Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch" into pi-dev
am: 8f222b9e15

Change-Id: Id145117b535cc7a304b6c91897770d550a4e97ac
2018-05-14 21:16:52 -07:00
Isaac Chen 8f222b9e15 Merge "Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch" into pi-dev 2018-05-15 04:09:36 +00:00
Calin Juravle b657d5ce62 Merge "Create dist for boot and system jars" into pi-dev
am: 42293db357

Change-Id: I56c5591dd9818bb7fa9338d3e67c7350b1679146
2018-05-14 10:49:31 -07:00
TreeHugger Robot 42293db357 Merge "Create dist for boot and system jars" into pi-dev 2018-05-14 17:37:41 +00:00
Calin Juravle 8955a99f06 Create dist for boot and system jars
We need the jars on boot and system server classpath in order to
symbolize profile information. Having the jars packed in a dist zip will
help a lot with the tools.

Test: m
Bug: 73313191
Change-Id: I5b64268d240055282099e9b86a5e6869e6405968
2018-05-11 16:38:03 -07:00
Bowgo Tsai 4f2b09be68 Merge "Enable /cache mount point" into pi-dev
am: 115aae0f93

Change-Id: I0e89f53b8fe5a932de7641646d5b034358e1bdd0
2018-05-10 19:20:54 -07:00
Logan Chien d73b94c097 Build a single GSI for O-MR1-VENDOR and Master-VENDOR
The objective of this commit is to support these 3 combinations:

1. Master-GSI + Master-VENDOR (w/ BOARD_VNDK_VERSION)
2. Master-GSI + Master-VENDOR (w/o BOARD_VNDK_VERSION for upgrading devices)
3. Master-GSI + O-MR1-VENDOR (w/ BOARD_VNDK_VERSION)

This commit defines a new property `ro.vndk.lite` to indicate the status
of BOARD_VNDK_VERSION run-time enforcement.  Now, all devices should
have `ro.vndk.version` so that `libhidlbase.so`, `libRSCpuRef.so`, and
`libnativeloader.so` can find the versioned VNDK directory.

Bug: 78605339
Test: aosp_sailfish Master-SYSTEM + Master-VENDOR boots
Test: aosp_sailfish Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-SYSTEM + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + O-MR1-VENDOR boots
Change-Id: Iee9553b3ca9e0798a873e655d87d10cdc23d4b1c
2018-05-10 21:17:58 +08:00
Bowgo Tsai 4e9ff91935 Enable /cache mount point
Non-A/B devices using AOSP OTA flow will mount /cache in the
fstab file. Without setting BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE,
/cache will be a symlink to /data/cache which introduces the
failure of `mount_all /vendor/etc/fstab.{ro.hardware}`. This is
because all devices laucned in P need to switch to "system-as-root".

This CL sets board config to create /cache directory in rootfs
(system-as-root GSI image). Note that A/B devices doesn't mount
or use /cache so leaving an empty /cache in rootfs has no harm.

Bug: 78485405
Test: Boot GSI on walleye
Change-Id: Ic260d2917cc64c9497f5f60ea11303e953e80efd
2018-05-10 15:20:49 +08:00
Isaac Chen 075ee920fb Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch
GSI Pi (for newly launched devices) need to enable this to pass
VtsTrebleSysProp.

Bug: 79395858
Test: Built aosp_{arm,arm64,x86,x86_64}. Check system/etc/prop.default
    and found "ro.actionable_compatible_property.enabled=true".
    aosp_x86(_64) could boot to home screen.

Change-Id: I04a4ff7c5feee7671d727c04c9d9657b63ec0912
2018-05-10 13:13:21 +08:00
Dan Willemsen 4541382d82 Merge "Add micro_bench to PRODUCT_PACKAGES_DEBUG" am: 63097b276b
am: 0eeb4e2f4b

Change-Id: Idaf94b2bdc340ec0bfa013c3b7d418cf766e6555
2018-05-09 19:46:33 -07:00
Isaac Chen d332396af8 Merge "Remove redundant entries from treble_common.mk" into pi-dev
am: 0502416b95

Change-Id: I0e12991e632207c063586d30f1ab7fa7063208e8
2018-05-09 19:03:17 -07:00
Isaac Chen 0502416b95 Merge "Remove redundant entries from treble_common.mk" into pi-dev 2018-05-10 01:56:19 +00:00
Dan Willemsen a362bf4e20 Add micro_bench to PRODUCT_PACKAGES_DEBUG
It's been converted to Soong, so can no longer use LOCAL_MODULE_TAGS. It
appears that some of the test runners expect to have it pre-installed.

Test: m; see it installed.
Change-Id: I189c9bbc2f2add90ac4f6841f4bf13852e4d579f
2018-05-09 17:33:12 -07:00
Calin Juravle 5b92db48ef Merge "Remove unnecessary dalvik.vm.extra-opts from profile_boot_common" into pi-dev
am: d9a863b534

Change-Id: I3c9a85edc4a8512a9285f552e9ebf09bed465585
2018-05-09 12:12:53 -07:00
Calin Juravle d9a863b534 Merge "Remove unnecessary dalvik.vm.extra-opts from profile_boot_common" into pi-dev 2018-05-09 18:04:24 +00:00
Calin Juravle 7478781f58 Remove unnecessary dalvik.vm.extra-opts from profile_boot_common
The flag is already passed if dalvik.vm.profilebootimage=true.

Test: m
Bug: 73313191
Change-Id: I7bfe91f295548e6aa9d6a783623e6344221136fb
2018-05-09 17:45:22 +00:00
Isaac Chen 64dec58cc2 Merge "Build disabled vbmeta.img for aosp_$arch" into pi-dev
am: 0d35d1a425

Change-Id: I9d0865299c34dd6997d08bb1a297ca6acda9ef8b
2018-05-09 00:00:47 -07:00
Isaac Chen 0d35d1a425 Merge "Build disabled vbmeta.img for aosp_$arch" into pi-dev 2018-05-09 06:53:03 +00:00
Isaac Chen e63c937bc3 Build disabled vbmeta.img for aosp_$arch
System images of aosp_$arch are used as GSIs in P, and traditional GSI
users often need a special vbmeta image to disable verity (if AVB is
employed) befrre they flash the GSI.

"BOARD_BUILD_DISABLED_VBMETAIMAGE := true" builds such vbmeta.img

Bug: 79393905
Test: # For arch in arm, arm64, x86, x86_64, do
    $ lunch aosp_$arch; m -j # found vbmeta.img under $OUT

Change-Id: I113006385991a2daab60d3c55dc03f23f1b383b8
2018-05-08 18:10:06 +08:00
Isaac Chen e6ba13f561 Remove redundant entries from treble_common.mk
Following entries in treble_common.mk are redundant:
 - vndk_package		# main.mk
 - libvulkan		# base.mk
 - audio.a2dp.default	# full_base.mk
 - netutils-wrapper-1.0	# full_base.mk

Bug: 78253534
Test: built and the components above are still included.
Change-Id: Iab75b46cba2fa64dd62a10ac6879da09349ad8bc
2018-05-08 11:09:28 +08:00
android-build-team Robot 3b6ab836e3 Merge changes from topic "remove_bufferhub_from_vndk" into pi-dev
am: 00e17fa8b4

Change-Id: I4dcbb5194789a358dea2f5d5b64b722c6cfd10a3
2018-05-07 14:30:01 -07:00
android-build-team Robot 00e17fa8b4 Merge changes from topic "remove_bufferhub_from_vndk" into pi-dev
* changes:
  Remove some VNDK libraries that were incorrectly added
  Remove some VNDK libraries that were incorrectly added
2018-05-07 21:20:13 +00:00
android-build-team Robot 1ccf2c3563 Merge "Add vr_hwc to GSI" into pi-dev
am: d819512eee

Change-Id: Iff5f9850c31ed03172452713eaea12eea2d56b8c
2018-05-07 13:44:16 -07:00
android-build-team Robot d819512eee Merge "Add vr_hwc to GSI" into pi-dev 2018-05-07 20:34:05 +00:00
Mathieu Chartier 90d229d096 Specify speed compiler filter for image
am: c0890b9386

Change-Id: I7f0caf153d7cac897a282441420cb73e9daa3035
2018-05-07 10:17:30 -07:00
SzuWei Lin ece9324bed Add vr_hwc to GSI
Bug: 78308559
Test: Check the /system/etc/init/vr_hwc.rc and /system/bin/vr_hwc
      are built into system.img

Change-Id: I84ac8149d1bccaff0451f4a4ae679853d6625976
2018-05-07 13:44:30 +08:00
android-build-prod (mdb) 78c516077c Merge "Add iotop to PRODUCT_PACKAGES_DEBUG" am: ab235a9fb8
am: 954d6b2075

Change-Id: I5a478d2d9e37bb60e76394ed7be8317da009049c
2018-05-05 14:44:21 -07:00
Jiwen 'Steve' Cai 37ede1b626 Remove some VNDK libraries that were incorrectly added
This is inspired by ag/3915101 and ag/3865679: Following libs for VR
were added due to the dependency from libgui. Since the dependency is
cut for vendor variant of libgui, they don't need to be in VNDK
consuming storage.

- libbufferhub
- libbufferhubqueue
- libpdx_default_transport

Bug: 79151096
Test: Build system and inspect bufferhub/pdx related libraries are no
longer in vendor partition.

Change-Id: I4dd2c04edd9be0215a214e01733f4ae944d5a180
2018-05-04 19:14:48 -07:00
Jiyong Park aa43c4b7d3 Remove some VNDK libraries that were incorrectly added
Following libs for VR were added due to the dependency from libgui.
Since the dependency is cut for vendor variant of libgui, they don't
need to be in VNDK consuming storage.

- libbufferhub
- libbufferhubqueue
- libpdx_default_transport

Bug: 77155589
Test: m -j

Merged-In: I9e6392464b3c936323c01b19d97d65635804a104
Change-Id: I9e6392464b3c936323c01b19d97d65635804a104
(cherry picked from commit 82241b83fc)
(cherry picked from commit d4577e762f)
2018-05-04 19:11:17 -07:00
Dan Willemsen aeaf4c2407 Add iotop to PRODUCT_PACKAGES_DEBUG
This was previously marked as LOCAL_MODULE_TAGS := debug, and is used
from dumpstate.

Test: iotop is still installed after remove the debug tag
Change-Id: I685456f52403a2d5c6fbbff1429c6af422ce26df
2018-05-04 18:53:34 -07:00
Calin Juravle dfbf63db59 Create a common product config for boot image profiling
am: 053a04f68e

Change-Id: I36010fd4a96450ab1660cd60bbc88eaf5defd3d0
2018-05-04 16:16:07 -07:00
Mathieu Chartier c0890b9386 Specify speed compiler filter for image
To get better performance, specify speed compiler filter. This will
enable system server to run with a compiled boot image

Bug: 73313191
Test: make and flash sailfish
Change-Id: Ic41870c53620b9ae4cc48fc560740f8c7e09e5b2
2018-05-04 23:04:51 +00:00
Calin Juravle 053a04f68e Create a common product config for boot image profiling
Test: manual
Bug: 73313191
Change-Id: Ia25e9dc84509be110feabfbd6d7596087d1e441d
2018-05-04 14:41:48 -07:00
android-build-team Robot c92b6796ce Merge "Disable privapp_permissions checking in GSI temporarily" into pi-dev
am: 76354382d1

Change-Id: Ib2e1f092721c486b4660487e1302a7d9012525c0
2018-05-03 16:17:08 -07:00
SzuWei Lin c71d9863c6 Disable privapp_permissions checking in GSI temporarily
Some vendor apps are using shared UID without white-listing the apps.
A runtime checking with these apps causes some devcies cannot boot
with GSI. We disable the checking before bug b/78105955 solved.

Bug: 79174430
Bug: 78105955
Test: Boot pixel devices with GSI applied the patch.
Change-Id: Ic25f5e2c4506b79564959adf57839a7ddc4330c2
2018-05-03 13:34:26 +08:00
android-build-team Robot 70299e3414 Merge "Create system.prop for GSI Pi" into pi-dev
am: 5646b804de

Change-Id: Ie9f26ef4e76905d8cf77de97242a39cef22cf082
2018-04-30 14:14:55 -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
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 50958e2cae Merge "Enable VNDK for aosp_arm(64)" 2018-04-24 18:10:44 +00: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
Treehugger Robot 3527ff9b84 Merge "Make aosp_$arch system images closer to GSIs" 2018-04-24 02:19:23 +00: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 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
Isaac Chen f71547079a 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
2018-04-23 19:19:29 +08:00
Elliott Hughes 90f18c4a5d Merge "Remove obsolete (and broken) targets." am: 388f1458a5
am: 2f5404be70

Change-Id: I217a7ff3636c8a2b3ea1113240dc686fb5ecff5a
2018-04-21 11:06:59 -07:00
Jiyong Park d4577e762f Remove some VNDK libraries that were incorrectly added
Following libs for VR were added due to the dependency from libgui.
Since the dependency is cut for vendor variant of libgui, they don't
need to be in VNDK consuming storage.

- libbufferhub
- libbufferhubqueue
- libpdx_default_transport

Bug: 77155589
Test: m -j

Merged-In: I9e6392464b3c936323c01b19d97d65635804a104
Change-Id: I9e6392464b3c936323c01b19d97d65635804a104
(cherry picked from commit 82241b83fc)
2018-04-21 13:26:58 +09:00
bohu 9c9bb50348 Merge "emulator: use 4.9 kernel" into pi-dev
am: 6181ffa9e7

Change-Id: Ie0519d1c859d257c59ed0a57b4c3756507b58ddd
2018-04-20 18:30:30 -07:00
TreeHugger Robot 6181ffa9e7 Merge "emulator: use 4.9 kernel" into pi-dev 2018-04-21 00:57:33 +00:00
Pirama Arumuga Nainar 5a1598938f Remove obsolete (and broken) targets.
Bug: N/A
Test: N/A
Change-Id: I461e1adae9c0fec026f05cb890af2c4d8bd71e58
2018-04-20 15:18:22 -07:00
huans c47b50ec92 Merge "Add permission files for Camera HAL3." into pi-dev
am: 555aaba3b0

Change-Id: Ie4c7b4c6dff03693b68435a9b1445ecc05d98385
2018-04-20 11:44:44 -07:00
TreeHugger Robot 555aaba3b0 Merge "Add permission files for Camera HAL3." into pi-dev 2018-04-20 18:34:47 +00:00
bohu 6fb387a37c emulator: use 4.9 kernel
BUG: 78272519

this cl does not impact real devices

Change-Id: Iff799d5185fad67e911f888443433ca97e87bb32
2018-04-20 09:57:57 -07:00
Yohei Yukawa 2cf2700175 Stop pre-installing OpenWnn by default
Bug: 78292367
Test: Manually verified taht OpenWnn is no longer pre-installed
Change-Id: I8463f5519d9ea8179027d3b4639821e96fec32b9
2018-04-19 17:25:50 -07:00
Ricardo Garcia a945f34136 Merge "Dynamics Processing Effect" into pi-dev
am: 6a13a5e776

Change-Id: I4e3d4367a4b85a49c6a294ae82cae0c32d18dbc0
2018-04-19 12:59:28 -07:00
Ricardo Garcia 6a13a5e776 Merge "Dynamics Processing Effect" into pi-dev 2018-04-19 19:52:33 +00:00
rago 7657f5ea03 Dynamics Processing Effect
Configuring Dynamics Processing effect

Bug: 64161702
Bug: 38266419

Test: manual and CTS testing
Change-Id: I133d115a4e820bff190f0ecd35efb721ef9a5e82
2018-04-19 09:52:46 -07:00
Isaac Chen 97a1b157d9 Merge "Make aosp_$arch system images closer to GSIs" into pi-dev
am: 81a492c7e8

Change-Id: I07870685ece000f4da2231f12095dbf0ae32ac95
2018-04-18 17:56:00 -07:00
Isaac Chen 164eed2e7d 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
2018-04-18 18:28:41 +08:00
huans 1c39155266 Add permission files for Camera HAL3.
Bug: 78175062
Test: Manual

This cl does not impact real device images

Change-Id: Ic98a571b54c00ab34db9e4be0b3460c6d95b50af
2018-04-17 18:42:43 +00:00
Isaac Chen 3137955323 Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" into pi-dev
am: 6bb69c4c3d

Change-Id: I492a34654f88a2191f23160722461b9cd85af4b0
2018-04-16 22:28:51 -07:00
TreeHugger Robot 6bb69c4c3d Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" into pi-dev 2018-04-17 05:22:35 +00:00
Justin Yun 48db42ff7b Update the final 28.txt before release.
am: 41eb5058bf

Change-Id: I9ab82a1d2c7a9a94eca974215cf10e2d9a604e0a
2018-04-16 16:13:33 -07:00
Andrew Hsieh 30791d858f Merge "Update current.txt to add libminijail.so" into pi-dev 2018-04-16 22:54:58 +00:00
Andreas Gampe 875a95a494 Merge "Revert "Build: Support for compiled-classes file"" am: 1cd44482db
am: 7033cc2c6f

Change-Id: I83a5d50c39dc0c83f133121f0680d99388e17daa
2018-04-16 11:17:24 -07:00
Justin Yun 41eb5058bf Update the final 28.txt before release.
Add libminijail.so to VNDK list.

Bug: 63866913
Test: Build sailfish and libminijail.so should be installed into
/system/lib[64]/vndk/libminijail.so instead of
/vendor/lib[64]/libminijail.so.

Change-Id: I611598f0fc700dcee7829badb975479803c8b7ad
2018-04-16 06:52:54 +00:00
Justin Yun 0b2f5279d6 Update current.txt to add libminijail.so
Add libminijail.so to VNDK list.

Bug: 63866913
Test: Build sailfish and libminijail.so should be installed into
/system/lib[64]/vndk/libminijail.so instead of
/vendor/lib[64]/libminijail.so.

Change-Id: Iaddfc4f4810458e5061841a9c4b99eb6052934c7
Merged-In: Ie90111c10781cc366faa711027f279601709fe56
2018-04-14 05:17:19 +00:00
Wale Ogunwale 4079cd2259 Merge "Freeze VNDK list for finalizing P SDK" into pi-dev
am: 03b6fa6a64

Change-Id: Id729269a0e333a3b6ed5ed32ca4735f8ebbbfaf3
2018-04-13 14:07:13 -07:00
Wale Ogunwale 03b6fa6a64 Merge "Freeze VNDK list for finalizing P SDK" into pi-dev 2018-04-13 20:53:03 +00:00
Ruchi Kandoi 85bc17b549 Merge "Adds SecureElement apk to core.mk" into pi-dev
am: 08afb09c5c

Change-Id: I21d6a5fa950a017881d9ffd68cf6a8f2414f322f
2018-04-13 13:45:08 -07:00
TreeHugger Robot 08afb09c5c Merge "Adds SecureElement apk to core.mk" into pi-dev 2018-04-13 20:30:26 +00:00
Andreas Gampe 35ab4203ef Revert "Build: Support for compiled-classes file"
This reverts commit 96a522037f.

Bug: 76145463
Test: m
Change-Id: I5a368cd01812e16869352ec219eae095df4919c4
2018-04-13 13:08:13 -07:00