Test: builds and verify that system/compatibility_matrix.xml
has configs filled.
Test: `vintf | tail` on marlin shows that fwk compat mat
is compatible with runtime info.
Bug: 38324908
Change-Id: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
Merged-In: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
Note that this depends on a change in avbtool:
https://android-review.googlesource.com/#/c/406374/
Bug: 38325029
Test: builds system.img, checks $OUT/system/compatibility_matrix.xml
contains correct vbmeta-version
Change-Id: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
Merged-In: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
Test: test with DEVICE_MANIFEST_FILE variable split
into multiple files
Bug: 38217107
Change-Id: I1146898e4ccf0e8bac7d8541032f160476dbc148
Merged-In: I1146898e4ccf0e8bac7d8541032f160476dbc148
This reverts commit 7de79cbeaf.
Fixed CTS build issue by adding -march=armv7-a in cts/tests/tests/os/jni/Android.mk since the library built here needs/uses instruction (swp) obsolete in ARMv8.
Bug: 64964151
Test: lunch aosp_arm64-userdebug; make -j cts
lunch aosp_x86-userdebug; make -j cts
lunch aosp_sailfish-userdebug; make -j cts
lunch aosp_bullhead-userdebug; make -j cts
Change-Id: Ic3a121600da8e2a9a2d5176b9680cd18ce457959
Some selinux build packages are defined in embedded.mk,
others are defined in system/sepolicy/Android.mk. Move all
to sepolicy as a dependency of the phony package selinux_policy
which is defined in embedded.mk.
Test: build Marlin (Treble) and Angler (non-Treble)
Merged-In: I734c2909354349d146c6f78beb74bd990d9af30d
Change-Id: I734c2909354349d146c6f78beb74bd990d9af30d
For 64-bit GSI, there are two different zygote settings:
1. 64-bit primary, 32-bit secondary (init.zygote64_32.rc) OR
2. 32-bit primary, 64-bit secondary (init.zygote32_64.rc)
3. 64-bit only is currently forbidden (b/64280459#comment6)
This change adds the second setting into root dir for vendor.img to
select. The first setting already exists.
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 is removed
because the property will be put into vendor.img. i.e., it has no effect
on GSI.
Bug: 64280459
Test: build and boot device, checks init.zygote32_64.rc is in rootdir
Change-Id: I16b36018acac8cfeee7281d6f4b6c9c19467abec
Add vndk_package into PRODUCT_PACKAGES, which includes
HAL interfaces, VNDK, VNDK-SP and LL-NDK.
vndk_package increases the total size of GSI content, so
changes the system partition size of:
* 64 bits projects to 1.5GB
* 32 bits projects to 1.0GB
Bug: 64654641
Test: build all GSI projects
Change-Id: I3c66c966eceebd63ee19f6a3de778beed0be6de5
Move the common 32/64 bits product settings from aosp_xxx.mk to
target/product/treble_common_(32|64).mk
The original core_64_bit.mk is not match the GSI requirement,
and will be revised soon. So, clone the content of
core_64_bit.mk into treble_common_64.mk.
Bug: 64653300
Test: Build pass
Change-Id: I6154a5c4927287c703a874b5cbf6a7f0c2c3594c
Recent changes in emulator requires advancedFeatures.ini,
encryptionkey.img and new kernels (such as 3.18) at OUT directory
so emulator can find them.
This CL set those up as part of the build process.
Change-Id: Ib3b7c4c48a22cecb44255e643402fd1c37797522
Install emulator specific binaries and libraries
to vendor partition; update selinux; add vndk.
BUG: 37511975
Test: build user build, launch emualtor, run CTS.
Change-Id: I70f58947e98b41b195d77b4347d2efdc09348392
BUG: 37511975
Test: lunch sdk_gphone_x86-user, make with dist option, unzip
sdk_gphone_x86-emulator-eng.xxxx.zip to system image folder, emulator
can boot
Change-Id: I75b9f0de17fece3dec5ae1662400808af321bd4d
Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.
Bug: 62554875
Test: mm test-art-host
(cherry picked from commit 865d54caf2)
Change-Id: Id711ad1c2d98b12b0f55a29acca8a96834d69ede
Some device has small ROM size, so the GSI should be as small as
possible. The patch change the image sizes to be:
- 64 projects (default): 1.25GB (1280MB)
- 32 projects (default): 0.75GB (768MB)
- ARM32 projects: 734MB
Bug: 64458958
Test: Build all GSI projects
Change-Id: I7f7a266e48e99b0b4d5c6a84b8187b56e4482c94
Overwrite TARGET_(2ND_)ARCH_VARIANT as armv8-a if
TARGET_(2ND_)CPU_VARIANT is set to some known armv8-a core like
cortex-a53, cortex-a73, kryo, denver64 etc.
For clang, -march is ignored if -mcpu is set to specific core so this
change doen't impact the objects built for armv7-a-neon/some_armv8_core
since it's treated as armv8-a/some_armv8_core.
Bug: 62895439
Test: Built modified aosp_arm64 with armv8-a as its TARGET_2ND_CPU_ARCH
and generic as its TARGET_2ND_CPU_VARIANT successfully.
"lunch hikey-userdebug; make" and verify TARGET_2ND_ARCH_VARIANT
is overwritten.
Change-Id: If4260cf397783b5f56c4fd432615f4676429a1d3
This phony module aggregates all the VNDK-related libraries so that they
can be installed to the system partition simply by adding 'vndk_package'
to PRODUCT_PACKAGES. This is to sneure that all VNDK libraries are
installed even when there is no vendor library using some of the VNDK
libs (especially when building system image only).
Bug: 64013660
Test: BOARD_VNDK_VERSION=current m -j vndk_package
Merged-In: I3a14a7eaaffd6a7f3258a4be59b1c5813153714d
Change-Id: I3a14a7eaaffd6a7f3258a4be59b1c5813153714d
This phony module aggregates all the VNDK-related libraries so that they
can be installed to the system partition simply by adding 'vndk_package'
to PRODUCT_PACKAGES. This is to sneure that all VNDK libraries are
installed even when there is no vendor library using some of the VNDK
libs (especially when building system image only).
Bug: 64013660
Test: BOARD_VNDK_VERSION=current m -j vndk_package
Change-Id: I3a14a7eaaffd6a7f3258a4be59b1c5813153714d
* changes:
Add new products aosp_x86_a and aosp_x86_64_a
Add new product aosp_arm_ab
Share system properties with all GSI project with treble_system.prop
Also sort the locales alphabetically (keeping en-US first) and move
them to separate lines.
Bug: 64394698
Test: none
Change-Id: I3aad3ce1ad9093ffe0ffdf56ebb6f287aec29d44
Permit transition of logcat to Android.bp by moving the debug
target logpersist.start to the PRODUCT_PACKAGES_DEBUG list.
Test: compile
Change-Id: I6cfd4c40f848a2ff2661e3692fa8cd69ed99e8c9
Add ThermalService daemon to embedded.mk as part of the minimal build
of open source parts of the tree.
Test: manual on marlin
Bug: 30982366
Change-Id: I8315a8f5871ec24d8970deaa8527ee74db1c4dc7
(cherry picked from commit d006688090)
Generic system image always generates dex pre-opt in system image,
to improve the time of first boot.
But the property ro.cp_system_other_odex could be defined in vendor
image, so we disable the property in generic system image to force
dex pre-opt be loaded from system image.
Bug: 62645784
Test: Test the patch on a A/B project with GSI, confirm the dex
pre-opt is loaded from GSI.
Change-Id: I71b4a5bed517841b5f889d21d73429fa91da25ba
Merged-In: I71b4a5bed517841b5f889d21d73429fa91da25ba
(cherry picked from commit 5677b877fb)
Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.
(cherry-picked from commit 865d54caf2)
Bug: 62554875
Test: mm test-art-host
Merged-In: I2486d2704d74a192f1ecdc02589e569b61efa4ae
Change-Id: I2486d2704d74a192f1ecdc02589e569b61efa4ae
AVB should be disabled for Treble VTS. Otherwise, OEM devices cannot boot
the generic system.img provided by Google.
Bug: 64055917
Test: Compiles and boot a device with the vbmeta.img
Change-Id: I0eaae7beebc8b901d0b4766c2cdc34a27ad02b59
This reverts commit 9b99ddc8a5.
and add syste-qemu.img to the dependency list of sdk target
BUG: 64235252
Test: build sdk target successfully
(cherry picked from commit f0d50bbef0)
Change-Id: I813233c7c3f06eb1eca18aad5ea890a55814eb1b
This reverts commit 9b99ddc8a5.
and add syste-qemu.img to the dependency list of sdk target
Test: build sdk target successfully
Change-Id: Idb0bee56275f3bfe33ba7d29463e4b8e0699ec33
For raw system.img and vendor.img do not have
partition table and init refuses to mount them
in first stage mounting.
For emulator build:
create partitioned system-qemu.img for system.img;
create partitioned vendor-qemu.img for vendor.img
if applicable.
Change-Id: I64fdcdafc303cf2f74a1e96653e7afe259f0af98
The product is for GSI with x86 64-bits and 32-bits with A/B
update.
Bug: 38339398
Test: Build pass
Change-Id: I1f945a812e0fbf8c4266d2f91624c2c674941383
Merged-In: I1f945a812e0fbf8c4266d2f91624c2c674941383
(cherry picked from commit 06956fe54c)
The product is for GSI with x86 64-bits and 32-bits without A/B
update.
Bug: 38339837
Test: Build pass and boot to home screen on 32/64-bits x86 emulator
by replacing system image with GSI
Change-Id: I9f956bc35ba5700900df7c2fca45bf794684a418
Merged-In: I9f956bc35ba5700900df7c2fca45bf794684a418
(cherry picked from commit 4b189c810e)
The product is for GSI with ARM 32-bits and A/B update.
Bug: 38339485
Test: Build pass
Change-Id: Ifad208d2e625f30d0a3dd964d53d81257eeefabf
Merged-In: Ifad208d2e625f30d0a3dd964d53d81257eeefabf
(cherry picked from commit fbc4835faa)
Use TARGET_SYSTEM_PROP to assign a common system property file in each
GSI BoardConfig.mk
Bug: 62647757
Test: make and check the file system/build.prop in out folder
Change-Id: Ifb3e02356869f97573a3690a6d67c2b4a9471c46
Merged-In: Ifb3e02356869f97573a3690a6d67c2b4a9471c46
(cherry picked from commit 7e10169909)
This attribute has been removed from public policy and is no longer
available.
Bug: 38316109
Test: build policy
Change-Id: I3407ced2d725de982e19b77345827de03d93c426
(cherry picked from commit ec488e1fee)
This will ensure that the library is on all devices even
if no builtin apps uses the lib.
Bug: 63905942
Test: Ran an application that uses the NN API.
Change-Id: I52ce6142f94d21ca55fa26875fab3f4926e2c6bb
For Android O release PRODUCT_SHIPPING_API_LEVEL is set to 26.
Change-Id: Ie1d5af375f2db95850fc5395d6a0c775dbfa046d
Merged-In: Ie1d5af375f2db95850fc5395d6a0c775dbfa046d
(cherry picked from commit f3251ac73b)
BOARD_USES_VENDORIMAGE is always true if TARGET_COPY_OUT_VENDOR
is 'vendor'.
Bug: 63609670
Test: build, flash and boot to home screen
Change-Id: I719a17f27e046448180e846a6597fa2fbf3c0726
Test: builds and verify that system/compatibility_matrix.xml
has configs filled.
Test: `vintf | tail` on marlin shows that fwk compat mat
is compatible with runtime info.
Bug: 38324908
Change-Id: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
Configstore was up-revisioned from 1.0 to 1.1. However no new
APIs were added to 1.1. Therefore configstore in dr1 will be down
revisioned to 1.0.
Bug: 63440035
Test: build & run
Change-Id: Ife60328110c6d6cb3e8024fb4a5caabc4c7c034f
Merged-In: I21861448a5d607383b617f2f85bd378013e64090
For devices using core_minimal, set the number of retained
tombstones in userdebug and eng builds to 50. This will help
with dogfooding.
(cherry picked from commit 47e137f357)
Bug: 63131375
Test: lunch bullhead_userdebug && m && fastboot flashall && adb getprop tombstoned.max_tombstone_count
Change-Id: I163d40f7a8f73df1af1228309d7a7a95511bdef9
For devices using core_minimal, set the number of retained
tombstones in userdebug and eng builds to 50. This will help
with dogfooding.
Bug: 63131375
Test: lunch bullhead_userdebug && m && fastboot flashall && adb getprop tombstoned.max_tombstone_count
Change-Id: I163d40f7a8f73df1af1228309d7a7a95511bdef9
1. update rild libpath to vendor instead of system
Test: build sdk_phone_x86-eng and launch emulator
it should boot to home screen.
Change-Id: I7b9946e61de952e4b7ae89b740050b768be1cf99
The generic system.img shouldn't contain any specific verity metadata
because we don't mandate how to do verified boot. Plus, OC-DR devices
use AVB instead of vboot 1.0.
Bug: 62647718
Test: Boot a DR device with the generic system.img
Change-Id: I0966d88d4512621cce7b8abdc28a90a6e312a391
Move definition of necessary packages for ART to art/Android.mk.
Use the phony packages defined there in runtime_libart.mk.
Bug: 62087184
Test: m
Test: Device boots
Change-Id: Iae6e5bba2184b098820783dc5e9f6b5f2a9836e9
Note that this depends on a change in avbtool:
https://android-review.googlesource.com/#/c/406374/
Bug: 38325029
Test: builds system.img, checks $OUT/system/compatibility_matrix.xml
contains correct vbmeta-version
Change-Id: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
audio.a2dp.default is a system module. Generic system image includes
audio.a2dp.default to support A2DP if board has the capability.
Bug: 62649731
Test: build and check the file existance in system image
Merged-In: Iac4821b3daf993da9fc309b7b105db98ee4b89ce
Change-Id: I0d2194c4145927b21df5858a3787f8c210f2794c
(cherry picked from commit fe3191727b)
audio.a2dp.default is a system module. Generic system image includes
audio.a2dp.default to support A2DP if board has the capability.
Bug: 62649731
Test: build and check the file existance in system image
Change-Id: Iac4821b3daf993da9fc309b7b105db98ee4b89ce
wificond is part of the framework, and shouldn't be modified by
vendor. The patch adds wificond to PRODUCT_PACKAGES list of
Android makefile, and removes it from treble_common.mk.
Bug: 62646878
Test: Build and check the file existance in system image
Change-Id: I92f2b64c1912ed5106a72a56e831bc989a70979e
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal bootclasspath jars necessary to run
with dalvikvm/art.
Also refactor PRODUCT_BOOT_JARS in core-tiny.mk and core-minimal.mk to reuse TARGET_CORE_JARS.
The above variables can be used from scripts with get_build_var from envsetup.sh
$> get_build_var TARGET_CORE_JARS
<prints list of core jars>
(These changes are required to figure out what --bootclasspath_entry to pass to desugar).
Bug: 36902714
Test: make -j32 build-art-host build-art-target
Test: lunch aosp_angler-userdebug && make -j32
Test: make -j32 PRODUCT-sdk_google_aw_x86-sdk
Change-Id: If12569719343bfbba20c1cda9a5302ab541dbfc6
(cherry picked from commit f33a96c07f)
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal
bootclasspath jars necessary to run with dalvikvm/art.
Also refactor PRODUCT_BOOT_JARS in core-tiny.mk and core-minimal.mk
to reuse TARGET_CORE_JARS.
The above variables can be used from scripts with get_build_var
from envsetup.sh
$> get_build_var TARGET_CORE_JARS
<prints list of core jars>
(These changes are required to figure out what --bootclasspath_entry
to pass to desugar).
Bug: 36902714
Test: make -j32 build-art-host build-art-target
Test: lunch aosp_angler-userdebug && make -j32
Test: make -j32 PRODUCT-sdk_google_aw_x86-sdk
Merged-In: If12569719343bfbba20c1cda9a5302ab541dbfc6
Change-Id: If12569719343bfbba20c1cda9a5302ab541dbfc6
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal bootclasspath jars necessary to run
with dalvikvm/art.
Also refactor PRODUCT_BOOT_JARS in core-tiny.mk and core-minimal.mk to reuse TARGET_CORE_JARS.
The above variables can be used from scripts with get_build_var from envsetup.sh
$> get_build_var TARGET_CORE_JARS
<prints list of core jars>
(These changes are required to figure out what --bootclasspath_entry to pass to desugar).
Bug: 36902714
Test: make -j32 build-art-host build-art-target
Test: lunch aosp_angler-userdebug && make -j32
Test: make -j32 PRODUCT-sdk_google_aw_x86-sdk
Change-Id: If12569719343bfbba20c1cda9a5302ab541dbfc6
This reverts commit 8c50798243.
Possible culprit of breakage in git_master sdk_google_aw_x86:
FAILED: out/target/product/generic_x86/dex_bootjars/system/framework/x86/boot.art
ex2oatd E 06-15 03:56:00 47990 47990 runtime.cc:1761] Failed to return pre-allocated NoClassDefFoundError
dex2oatd F 06-15 03:56:00 47990 47990 thread.cc:3591] Check failed: new_exception != nullptr
Testing if Treehugger passes with the rollback before submitting
https://android-build.googleplex.com/builds/submitted/4101897/sdk_google_aw_x86-sdk/latest/view/logs/build_error.log
Change-Id: Iceac31e775eaf3cd5fd9b3d2a17d3af200e35b27
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal
bootclasspath jars necessary to run with dalvikvm/art.
Also refactor PRODUCT_BOOT_JARS to reuse TARGET_CORE_JARS.
(These changes are required to figure out what --bootclasspath_entry
to pass to desugar).
Bug: 36902714
Test: make -j32 && make -j32 build-art-host build-art-target
Change-Id: I620e28be41047a1d501d7f144fe415ee4a0af36f
Includes:
- more HIDL interfaces
- explicitly specify all LL-NDK and SP-NDK (currently only
libandroid_net is missing)
- add liblzma and libyuv
Bug: 38339299
Test: build aosp_arm64_ab and pass
Change-Id: Ic67d47990cf6b4ab51e1b74f0fed85e60ce3a817
Move the common part from make file of generic AOSP system images into
treble_common.mk, and update the content of common part.
The common part inclueds:
- HAL interfaces
- VNDK libs
- VNDK-SP libs
- Some other modules supporting HAL interfaces
- Some Treble default configurations
Bug: 37927875
Test: boot to home screen with the generic system image
Merged-In: I4202454d57970cef713f7d6437191094df0009e9
Change-Id: I4202454d57970cef713f7d6437191094df0009e9
Changes in this CL:
1. Use ":=", instead of "+=", for PRODUCT_COPY_FILES so previous audio
policy related settings won't be overwritten.
2. Use basic audio policy XML files provided by audio team as default.
Bug: 62524944
Test: check if the XML files for audio policy configuration are under
/system/etc and devices with generic system imagei, but without
such configuration under /vendor/etc can boot with audio working.
Change-Id: I4ccffdfb131a9d2445d9c2f52a22ffcc97884479
Adds android.test.mock.jar to the /system/framework
directory. That will allow it to be dynamically included
with a uses-library manifest entry.
Bug: 30188076
Test: flash and check contents of /system/framework
Change-Id: I3ea0e558276176edd21e24c8337980c5c02a652e
Revert by Build Cop. This change is causing build failures across builders and branches, e.g.:
ninja: error: 'out/target/product/generic_x86/obj/lib/android.hidl.base@1.0.so', needed by 'checkbuild', missing and no known rule to make it
09:08:08 ninja failed with: exit status 1
This reverts commit 76ada93856.
Change-Id: I5e7bfa65a70cf5d61fb233cdbdfe7f420fd5ab51
Move the common part from make file of generic AOSP system images into
treble_common.mk, and update the content of common part.
The common part inclueds:
- HAL interfaces
- VNDK libs
- VNDK-SP libs
- Some other modules supporting HAL interfaces
- Some Treble default configurations
Bug: 37927875
Test: boot to home screen with the generic system image
Change-Id: I4202454d57970cef713f7d6437191094df0009e9
Move the common part from make file of generic AOSP system images into
treble_common.mk, and update the content of common part.
The common part inclueds:
- HAL interfaces
- VNDK libs
- VNDK-SP libs
- Some other modules supporting HAL interfaces
- Some Treble default configuations
Bug: 37927875
Test: boot to home screen with the generic system image
Change-Id: I4202454d57970cef713f7d6437191094df0009e9
Merged-In: I4202454d57970cef713f7d6437191094df0009e9
aosp_arm_a: for non-A/B 32-bit arm devices
aosp_arm64_a: for non-A/B 64-bit arm devices
Both are based on aosp_arm64_ab (for A/B devices).
Bug: 36153731
Test: build with oc-dev and the resulted system image works on one
32-bit arm device successfully (no 64-bit arm device to test yet).
Change-Id: Ifb5c4239e5c22005e055cfa840feca9c0a92586f
Fix missing android.hidl.manager.V1_0.IServiceNotification$Stub
on wear (needed by com.android.server.wifi.HalDeviceManager)
Bug: 38320705
Test: no bootloop on android wear
Change-Id: I1bb297d13be0024dbc2be3788a2906e9f3cee437
Signed-off-by: Ben Fennema <fennema@google.com>
This attribute has been removed from public policy and is no longer
available.
Bug: 38316109
Test: build policy
Change-Id: I3407ced2d725de982e19b77345827de03d93c426
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.
Test: links
Bug: 33276472
Change-Id: I2f13ad8151deff77850c4e18f6c84e2e55ba52d3
(cherry picked from commit c96c1de869)
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.
Test: links
Bug: 33276472
Change-Id: I2f13ad8151deff77850c4e18f6c84e2e55ba52d3
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.
Test: links
Bug: 33276472
Change-Id: I69f280c36533ce13d5f3b3f2b2eb8d969982cb50
(cherry picked from commit b586105307)
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.
Test: links
Bug: 33276472
Change-Id: I69f280c36533ce13d5f3b3f2b2eb8d969982cb50
Yifan Hong