Commit Graph

3786 Commits

Author SHA1 Message Date
Anton Hansson 9c96dcaa87 Merge "Remove core.mk." into stage-aosp-master 2018-06-20 17:40:44 +00:00
Anton Hansson e9d34eccf3 Merge "Remove sdk_base.mk." into stage-aosp-master 2018-06-20 17:27:29 +00:00
Dan Willemsen 93e1a187c7 Merge "aosp_x86_arm builds have overriding commands"
am: 6ae08c1416

Change-Id: Ie3cf105dfa9fca4c2e26e2a5e96b992a1be343b6
2018-06-20 10:03:54 -07:00
Anton Hansson b40cd42eeb Merge "Delete core_tiny.mk" into stage-aosp-master 2018-06-20 14:07:14 +00: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
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