aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Refactor GSI BoardConfig.mkSzuWei Lin2019-01-0814-137/+41
| | | | | | | | | | | | | | | | | | | | | | The patch modifies the Legacy GSI to use BoardConfigGsiCommon.mk instead of board config treble-common*.mk, and delete these treble-common*.mk files. After the patch, the GSI common board configs are in single file BoardConfigGsiCommon.mk The patch also includes: - Moving `TARGET_COPY_OUT_VENDOR := vendor` to BoardConfigGsiCommon.mk, because GSI always contains no vendor contents. - Configure the binder interface bitness explicitly. - Unify the structure of each BoardConfig.mk. Bug: 122282239 Test: compare the out folder between with and without the patch Test: output files are all the same Change-Id: Ie5901446920dda317dea848e6d5a7bbcf10a32cf
* Set 32bits Legacy GSI to be 32bits binderSzuWei Lin2019-01-071-0/+3
| | | | | | | | | | The binder interface bitness is always 64bits from P. To keep 32bits binder interface for Legacy GSI, we need to explict configure it. Bug: 122282239 Test: lunch aosp_arm_ab-userdebug; make -j Change-Id: I90b45adb52c398d1c0cf3f877199f9dd1e0b3f86
* Reenable avb for mainlineAnton Hansson2018-12-042-5/+5
| | | | | | | | | | Partial rollback of Id5d114bde8b93800fe52c791ccc47cdffd86f382. It is likely mainline also wants some of the BOARD_AVB_SYSTEM.. flags, but I'm not entirely sure which ones. Test: run build_mixed with this patch Change-Id: I6ef3c01f6c74e6d93cf798b26b8c7a4785bbefb4
* Merge "Split GSI and mainline board configs"Anton Hansson2018-12-033-21/+31
|\
| * Split GSI and mainline board configsAnton Hansson2018-11-293-21/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the mainline board config only import a subset of the GSI options. The current set of attributes is the minimal set to keep mainline_system_arm64 building, as well as not producing any diffs in the current set of files in /system. It's possible we'll need to move a few more over, but we'll do that on a case-by-case basis. Make the GSI config inherit the mainline one. The only diff for GSI should be the addition of BOARD_USES_SYSTEM_OTHER_ODEX. Bug: 119911662 Test: build mainline_system_arm64 Change-Id: Id5d114bde8b93800fe52c791ccc47cdffd86f382
* | Remove USE_HWC2 plumbing and settingsAnton Hansson2018-11-292-3/+0
|/ | | | | | | Last use removed in Ibefde5feaeaec8fb68cbc6ea1c019bf8b5e608bb Test: make Change-Id: I0567347379b1d030ed2f8dba7babc1f22be5dac4
* Add BOARD_USES_SYSTEM_OTHER_ODEX := true to mainlineAnton Hansson2018-11-161-0/+4
| | | | | | | | | | Likely not the final setting we'll settle with for this device, but brings mainline_system builds closer to the device builds it's targeting. Bug: 80410283 Test: build mainline_arm64 Change-Id: Ib672d1a060d0ad6a4e1faa210461bbbbaf6f2bc6
* Add a mainline arm64 deviceAnton Hansson2018-10-293-4/+31
| | | | | | | | | | | | | | | | The existing 'generic' targets are emulator devices, and targeting it has the side-effect of including emulator-specific artifacts. Create a mainline device instead, which is really generic. This also allows specifying tweaks unsuitable for the emulator. Include BoardConfigGsiCommon for now, even though it includes a few things we likely won't want in the future. Bug: 80410283 Bug: 111538404 Test: lunch mainline_arm64; m Change-Id: I15e7cb41fcbd3c0592a091ba7a8575ddf10bda71
* Merge "Workaround Legancy GSI for some Wifi firmware"Treehugger Robot2018-10-193-3/+7
|\
| * Workaround Legancy GSI for some Wifi firmwareSzuWei Lin2018-10-193-3/+7
| | | | | | | | | | | | Bug: 117963911 Test: Turn on wifi with aosp_arm64_ab-userdebug on Pixel 1/2/3 devices Change-Id: I0d516876522a687709ff21cbfc5bc0cc415b8335
* | Merge "fix generic_x86_arm"bohu2018-10-184-34/+57
|\ \ | | | | | | | | | | | | | | | am: 569ddd300b Change-Id: I66338017c69b4ecfad9c630b1f9cbc6c45041d86
| * | fix generic_x86_armbohu2018-10-174-34/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make the generic_x86_arm bootable. Third party translabor binary can be added on the resulting system.img and be tested at least on emulator. BUG: 117673798 Change-Id: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7 Merged-In: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
* | | Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug""Bowgo Tsai2018-10-042-8/+4
|\| | | | | | | | | | | | | | | | | am: 3e795ee38b Change-Id: I1f97f0e1c36115e341397bbac76d684a083198d5
| * | Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug""Treehugger Robot2018-10-042-8/+4
| |\ \
| | * | Revert "Fix build error for sdk_gphone_x86_64-userdebug"Bowgo Tsai2018-10-032-8/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6924b25729541cba612241aebbd491aae51a2f43. Reason for revert: with the following fix, this workaround is no longer needed. https://android-review.googlesource.com/c/platform/build/+/762663 Bug: 112322265 Change-Id: I07363f6a5aa1697b6f7702343f3120e1049f07d8 Test: build sdk_gphone_x86_64-userdebug
* | | Merge "Enable TARGET_2ND_ARCH_VARIANT := armv7-a for vts build"yidong.zhang2018-09-211-1/+1
|\| | | | | | | | | | | | | | | | | am: 993513a7d0 Change-Id: Ic3b9480cd54942a13c8918a66ec22b45db78ed05
| * | Enable TARGET_2ND_ARCH_VARIANT := armv7-a for vts buildyidong.zhang2018-09-201-1/+1
| |/ | | | | | | | | | | | | | | | | Vts release package is not compatible with cortext-a7(armv7-a) cores. Build vts with TARGET_2ND_ARCH_VARIANT := armv7-a instead of armv8-a. Bug: 116070933 Test: run vts -m VtsHalBaseV1_0TargetTest on cortext-a7 platform Change-Id: I8089856223bac5129ad807496ad78b2cbfe1cc8a
* | Merge "Fix build error for sdk_gphone_x86_64-userdebug"Bowgo Tsai2018-09-112-4/+8
|\| | | | | | | | | | | am: 8596dd8828 Change-Id: Id209bcb1c4f24419980fdbb7dbef6c3c423ce788
| * Fix build error for sdk_gphone_x86_64-userdebugBowgo Tsai2018-09-112-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Increases BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE to 128MB to fix the build break. This is because we enabled AVB signing in the following CL. And verified boot metadata will consume the reserved size in current build system. https://android-review.googlesource.com/c/platform/build/+/745691 Bug: None Test: build sdk_gphone_x86_64-userdebug Change-Id: If1f44dccbc3a69b1b38a23e979f50c2c52401a25
* | Merge "Enable AVB signing on GSI"Bowgo Tsai2018-09-113-18/+35
|\| | | | | | | | | | | am: d9a58852bd Change-Id: I16b4761de19f135265df4df5698f042ee8c47400
| * Enable AVB signing on GSIBowgo Tsai2018-09-053-18/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In current GSI builds, AVB signing is not allowed. We should allow signing GSI image, while building a vbmeta.img with AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (flag 2). When need to disable AVB, use the vbmeta.img above together with the GSI. When need enable AVB on GSI, include the GSI public key into the device-specific vbmeta.img. Note that GSI is a chain partition so the keys used to sign GSI and vbmeta.img are different. Bug: 112293933 Test: build aosp_arm64-userdebug, checks flag 2 is set in vbmeta.img and there is AVB HASHTREE in system.img `avbtool info_image --image $OUT/system.img` `avbtool info_image --image $OUT/vbmeta.img` Change-Id: If1eff317621882994e7dcbf37cd35f5bfa16b69a
| * Add emulator audio policy config in /vendor not /systemKevin Rocard2018-08-214-32/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audio_policy_configuration_generic.xml is pushed in /system as the default configuration (used if the vendor does not provide one in /vendor or /odm) and for the emulator. As a result it can be parsed by 2.0 and 4.0 audio HALs. The format is retro-compatible, but not forward-compatible. Additionally, the generic config pushed in /system should never be used as the vendor should always provide a configuration file describing its target architecture. Thus it should not be part of the GSI. Those files were originally pushed in /system the emulator target does not provide its own configuration file. The emulator should provide config file instead in /vendor instead. Bug: 78543061 Test: sdk_gphone_x86 and aosp_x86_64 emulator has audio Test: adb shell cat /vendor/etc/audio_policy_configuration.xml | diff - \ frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml Change-Id: Ice43cb4670a82f4e60fcccc58a636d224f240b5a Merged-In: Ice43cb4670a82f4e60fcccc58a636d224f240b5a Signed-off-by: Kevin Rocard <krocard@google.com> (cherry picked from commit dad3ad6126f0d5a5e5e658a8fa0c146fb94e3f3f)
* | Merge "Remove default BUILD_BROKEN_DUP_RULES := false"Dan Willemsen2018-08-142-4/+0
|\| | | | | | | | | | | am: aa47189e1c Change-Id: Ib623fe24300b4310509f9b9d07aa26479226a8fe
| * Merge "Remove default BUILD_BROKEN_DUP_RULES := false"Treehugger Robot2018-08-142-4/+0
| |\
| | * Remove default BUILD_BROKEN_DUP_RULES := falseDan Willemsen2018-08-142-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | This is now false by default. Bug: 77611511 Test: build_test on git_master Change-Id: I37ad52a3846c77da184725e7d6f4daae9f4b7f1c
* | | Merge "Remove TARGET_USES_MKE2FS"Colin Cross2018-08-142-2/+0
|\| | | | | | | | | | | | | | | | | am: de684e84fb Change-Id: If2f3d4fba3e782d12962b2d99b3d6b709ff85b70
| * | Remove TARGET_USES_MKE2FSColin Cross2018-08-132-2/+0
| |/ | | | | | | | | | | | | | | | | | | Nothing reads TARGET_USES_MKE2FS any more, mke2fs is always used. Remove the requirement that TARGET_USES_MKE2FS is set, and remove the places it is set. Bug: 112241651 Test: m checkbuild Change-Id: Ibdca062bbe7dcd19ba8f7ee7f8291ce746b74e65
| * Merge "Enable dyanmic image size for GSI" into stage-aosp-masterTreeHugger Robot2018-08-0610-19/+6
| |\
| | * Enable dyanmic image size for GSISzuWei Lin2018-08-0310-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original size number of GSI are fixed size. Change to give size by the content with appending 64M bytes space. Bug: 71970853 Test: `make systemimage` and check the out system.img Change-Id: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1 Merged-In: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
* | | Merge "Revert "Revert "Build GSIs (aosp_$arch products) in sparse format""" ↵Isaac Chen2018-08-061-4/+5
|\| | | | | | | | | | | | | | | | | | | | | | | am: 451fa13fa6 am: 3085fc0c05 Change-Id: I873482e8a707ae2930e12fb4a333dbef95812e0b
| * | Merge "Revert "Revert "Build GSIs (aosp_$arch products) in sparse format"""Isaac Chen2018-08-061-4/+5
| |\ \ | | |/ | |/| | | | | | | | | | am: 451fa13fa6 Change-Id: I655794830ffc687c55f29d700368b9fc7074d23c
| | * Revert "Revert "Build GSIs (aosp_$arch products) in sparse format""Isaac Chen2018-08-051-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 132748cb80db768455e9118970520db180e905a5. Reason for revert: The e2fsck issue, b/112062612, that caused the revert of the original CL has been fixed in aosp/725259. Change-Id: I5c919aedcc5b1c4823f565ea2bbe0e6ea81bc3b0
* | | Merge "Enable dyanmic image size for GSI" into stage-dr1-aosp-masterTreeHugger Robot2018-08-0610-18/+6
|\ \ \
| * | | Enable dyanmic image size for GSISzuWei Lin2018-08-0310-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original size number of GSI are fixed size. Change to give size by the content with appending 64M bytes space. Bug: 71970853 Test: `make systemimage` and check the out system.img Change-Id: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
* | | | Merge "Add emulator audio policy config in /vendor not /system" into ↵TreeHugger Robot2018-08-034-32/+0
|\ \ \ \ | |/ / / |/| | | | | | | stage-dr1-aosp-master
| * | | Add emulator audio policy config in /vendor not /systemKevin Rocard2018-07-314-32/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audio_policy_configuration_generic.xml is pushed in /system as the default configuration (used if the vendor does not provide one in /vendor or /odm) and for the emulator. As a result it can be parsed by 2.0 and 4.0 audio HALs. The format is retro-compatible, but not forward-compatible. Additionally, the generic config pushed in /system should never be used as the vendor should always provide a configuration file describing its target architecture. Thus it should not be part of the GSI. Those files were originally pushed in /system the emulator target does not provide its own configuration file. The emulator should provide config file instead in /vendor instead. Bug: 78543061 Bug: 111963599 Test: sdk_gphone_x86 and aosp_x86_64 emulator has audio Test: adb shell cat /vendor/etc/audio_policy_configuration.xml | diff - \ frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml Change-Id: Ice43cb4670a82f4e60fcccc58a636d224f240b5a Merged-In: Ice43cb4670a82f4e60fcccc58a636d224f240b5a Signed-off-by: Kevin Rocard <krocard@google.com> (cherry picked from commit dad3ad6126f0d5a5e5e658a8fa0c146fb94e3f3f)
* | | | Merge "Revert "Build GSIs (aosp_$arch products) in sparse format"" am: ↵Colin Cross2018-08-011-5/+4
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | a2b0e478d3 am: 9d2fe1b5c7 Change-Id: I57115c3462dad64acc10a95fe2204599d66dae91
| * | Merge "Revert "Build GSIs (aosp_$arch products) in sparse format""Colin Cross2018-08-011-5/+4
| |\| | | | | | | | | | | | | | | | am: a2b0e478d3 Change-Id: Ia2191fd7e0653f7f634bf273667aecbdffa5635c
| | * Revert "Build GSIs (aosp_$arch products) in sparse format"Colin Cross2018-08-011-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bc0248f211fb14bef6158c9aee29fe820fb061c7. Reason for revert: Triggered preexisting issue with e2fsck and ASAN Bug: 112062612 Change-Id: I7b52fe539252ab1bb7229d32accb7abd6417f470
* | | Merge "Build GSIs (aosp_$arch products) in sparse format" am: 44c61176e8Isaac Chen2018-07-311-4/+5
|\| | | | | | | | | | | | | | | | | am: 442e2f4441 Change-Id: I7297b2bacf91db615c480e0de3c3edad0b3a0030
| * | Merge "Build GSIs (aosp_$arch products) in sparse format"Isaac Chen2018-07-311-4/+5
| |\| | | | | | | | | | | | | | | | am: 44c61176e8 Change-Id: Icfb51956662a4dbca0f8cf37ea9e4ddc6fe1c214
| | * Build GSIs (aosp_$arch products) in sparse formatIsaac Chen2018-07-261-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After aosp/719235 is merged, mk_qemu_image.sh now accepts images in both raw and sparse formats. So We can build GSIs (system images of aosp_$arch products) in sparse format, which, historically, is expected by users of GSIs. Bug: 111775319 Test: The system images below are all in sparse format: $ 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: I4cb8df0908c4618376117249b61c853fac947e47
* | | resolve merge conflicts of 2927f2185cde4c28818c2852c33255b26df4f584 to ↵SzuWei Lin2018-07-236-17/+20
|\| | | | | | | | | | | | | | | | | | | | | | | stage-dr1-aosp-master Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I7812dcb06172fd0ca5caf38ad8ee616cf1936f43
| * | Merge "Move some BoardConfig settings from EmuCommon to GsiCommon"SzuWei Lin2018-07-236-17/+20
| |\| | | | | | | | | | | | | | | | am: bcc4081cd1 Change-Id: I456dde1025f2e61c3c9c463c38279aa0404d91ac
| | * Move some BoardConfig settings from EmuCommon to GsiCommonSzuWei Lin2018-07-186-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the settings which effect the system image to the file BoardConfigGsiCommon.mk Bug: 80117040 Test: build aosp_arm64-userdebug and pass Change-Id: I42b14a124992c21b2da0e9e6197b1c38c6e58ce3 Merged-In: I42b14a124992c21b2da0e9e6197b1c38c6e58ce3
* | | Merge "Create extra symbolic links at root for arm64 GSI" am: 226dd71836Isaac Chen2018-07-161-2/+3
|\| | | | | | | | | | | | | | | | | am: 19a41487e9 Change-Id: If4d98998ff1c40ab1564f5107aad9dd719246aa6
| * | Merge "Create extra symbolic links at root for arm64 GSI"Isaac Chen2018-07-161-2/+3
| |\| | | | | | | | | | | | | | | | am: 226dd71836 Change-Id: I83fa295a8657ba93dd7e8e008e4c929499c0d1fd
| | * Merge "Create extra symbolic links at root for arm64 GSI"Treehugger Robot2018-07-161-2/+3
| | |\
| | | * Create extra symbolic links at root for arm64 GSIIsaac Chen2018-07-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relevant firmware/SW components have been moved out of directories under root, but not all references to them updated. For example, /vendor/firmware_mnt won't be used by Android to load firmware. So we still need these symlinks so the firmware/SW components can be accesses. These links should be removed after all references are updated. Bug: 111287060 Test: $ lunch aosp_arm64-userdebug; m -j # Checked $OUT/root for the added links Change-Id: Ia7915dbdeabdee7a5cf8851772e89f080b927c45
| | * | Move ro.config.low_ram back to being a vendor propertyMathieu Chartier2018-07-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 110517986 Test: make Change-Id: I1394ac1220c290533fbe9641d10c5997362577fd