p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
67,510 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

67510 Commits

Author SHA1 Message Date
Treehugger Robot afeb2bc404 Merge "Update m help text with guidance on parallelism" am: f3b8056189 
Original change: https://android-review.googlesource.com/c/platform/build/+/1612064

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c9de7523364d907232b038447e4aa07be3aa812
 2021-03-02 02:04:36 +00:00
Treehugger Robot 0181c7d33c Merge "Allow BOARD_VNDK_VERSION to be changed" 2021-03-02 01:22:45 +00:00
Treehugger Robot f3b8056189 Merge "Update m help text with guidance on parallelism" 2021-03-02 01:11:33 +00:00
TreeHugger Robot 0547bfd774 Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master 2021-03-02 01:09:06 +00:00
Donghyun Jo 8c65ef6574 Fix typo in sysprop.mk and Changes.md 
android_info_pro -> android_info_prop
partititon -> partition
PRODUCT_SYSTEM_PROPERITES -> PRODUCT_SYSTEM_PROPERTIES

Test: build and manual test

Signed-off-by: Donghyun Jo <donghyun.jo@samsung.com>
Change-Id: I0b7f0566aaa5ce8844003bb4f373389c20ddeb88
 2021-03-02 08:51:03 +09:00
Martin Stjernholm 786bbea407 Include android_soong_config_vars.mk in the make (kati) step. 
Test: `m nothing` with https://r.android.com/1592872
Bug: 172480615
Change-Id: I960cd234a5dd607f4f5af6bb68ae15b9bd104e7a
 2021-03-01 23:14:10 +00:00
Andrew Scull 2f8015f71a Merge "Add pvmfw partition to target files" am: 5553b5704c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1595341

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83e3ecd8d6cf9847c38508ab088ccb66d193c7a7
 2021-03-01 21:48:32 +00:00
Colin Cross 3fb7ddf3bc Update m help text with guidance on parallelism 
Remove "-j" from the default recommended arguments and add a paragraph
describing the -j behavior.

Test: m help
Change-Id: Id5a5f4719f18ea2a9d09df43f5fb38592a59f5c9
 2021-03-01 13:32:13 -08:00
Andrew Scull 5553b5704c Merge "Add pvmfw partition to target files" 2021-03-01 21:05:56 +00:00
Xin Li 3f904dd415 Merge RQ2A.210305.007 into stage. 
Bug: 180401296
Merged-In: I6d6542306c51ac1682f02cbce6701688d2bdbea2
Change-Id: I1c3a82d5c420fbb97e81379034947d35024b0925
 2021-03-01 00:54:23 -08:00
Xin Li 457b809bcc DO NOT MERGE - Mark RQ2A.210105.001 as merged. 
Bug: 180401296
Merged-In: Iebf46f1a9a88da5ba403024f2bf1bcd44c4b52fc
Change-Id: I4a86e7513cb1aac30c431674427a658fe24ae374
 2021-03-01 00:43:12 -08:00
Treehugger Robot 011aee1bc9 Merge "support pre-defined timestamp and uuid when bulid EROFS images" am: 0a4788c3fb 
Original change: https://android-review.googlesource.com/c/platform/build/+/1595714

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebf46f1a9a88da5ba403024f2bf1bcd44c4b52fc
 2021-03-01 07:25:30 +00:00
Treehugger Robot 0a4788c3fb Merge "support pre-defined timestamp and uuid when bulid EROFS images" 2021-03-01 06:29:49 +00:00
Joe Onorato fe65f90925 Merge "Add dirmods command to envsetup.sh" am: 2599d32a40 
Original change: https://android-review.googlesource.com/c/platform/build/+/1607836

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8e1b50cabe45a9643ca22ac31a39f8905825ab0
 2021-02-26 23:14:17 +00:00
Joe Onorato 2599d32a40 Merge "Add dirmods command to envsetup.sh" 2021-02-26 22:13:30 +00:00
Joe Onorato 2c1aa47057 Add dirmods command to envsetup.sh 
It will query module-info.json for modules inside a given directory.

Test: . build/envsetup.sh ; dirmods frameworks/base
Change-Id: Iad3dcb038315f49c156764e34fb5f52ec3ad29be
 2021-02-26 08:57:23 -08:00
Treehugger Robot a2f416b884 Merge "Add spl-downgrade field to ota metadata" am: d33ae8363c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1583043

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifea124b3f84c18fedda16cbda12528628072666f
 2021-02-25 23:31:44 +00:00
Treehugger Robot d33ae8363c Merge "Add spl-downgrade field to ota metadata" 2021-02-25 22:51:26 +00:00
Kelvin Zhang 05ff7055b6 Add spl-downgrade field to ota metadata 
In aosp/1581143 , we banned generation of SPL downgrade OTAs. However,
caller of OTA script can still force an SPL downgrade OTA by passing
--spl_downgrade flag. If this flag is specified, we propagate it to OTA
metadata so that GOTA server can properly honor this flag.

Test: th
Change-Id: Ic8cdc850d2210f4149ad9121fa4ed2e5a4f59bcc
 2021-02-25 10:15:45 -05:00
Inseob Kim 6e7693f159 Allow BOARD_VNDK_VERSION to be changed 
Some devices e.g. cuttlefish include BoardConfigMainlineCommon.mk.
This allows BOARD_VNDK_VERSION to be changed other than current, to
allow mixed build experiment with BOARD_VNDK_VERSION.

Test: try setting BOARD_VNDK_VERSION and get_build_var
Change-Id: I7eb7fe6527f24ee2a3b4af32194a48ca98146a78
 2021-02-25 21:22:27 +09:00
Treehugger Robot 38cbde20c0 Merge "Add dependency from target-files.zip to rsync'd recovery ramdisk files" am: 0e0307b0a2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1606554

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3252e0bdce61ee240dd42d6a287705433956aa9a
 2021-02-25 06:30:02 +00:00
Treehugger Robot 0e0307b0a2 Merge "Add dependency from target-files.zip to rsync'd recovery ramdisk files" 2021-02-25 06:03:01 +00:00
Treehugger Robot b002cc3fbe Merge "releasetools: Fix an issue in common.GetSparseImage" am: 90c1763c0c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1602475

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I302dd296101733c794a8a11c6ce6713beb170678
 2021-02-25 05:32:34 +00:00
Treehugger Robot 90c1763c0c Merge "releasetools: Fix an issue in common.GetSparseImage" 2021-02-25 05:05:42 +00:00
wangshumin 71af07abe8 releasetools: Fix an issue in common.GetSparseImage 
Fix incorrect report "Failed to find the ZIP entry" error when
generate OTA package.

This happens when we have a file in ROOT which name contains 'system'
such as init.system_init.rc, and init.system_init.rc will be rename to
init.SYSTEM_init.rc incorrectly, so we failed to find the entry in ZIP.

Test: manual test
Change-Id: I97359e513aaca7521fe9c035f6a4264a2053b86d
Signed-off-by: wangshumin <wangshumin@xiaomi.com>
 2021-02-25 09:34:57 +08:00
Colin Cross e643120c75 Add dependency from target-files.zip to rsync'd recovery ramdisk files 
target-files.zip may indirectly depend on the rsync'd recovery ramdisk
files when BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT is true.

Bug: 181095653
Test: manual
Change-Id: I673bb48b1fbb7a54455cda411f9444f05ddaa24f
 2021-02-24 11:44:55 -08:00
Roman Kiryanov 3cc2b4c489 Merge "Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"" am: 52037cf027 
Original change: https://android-review.googlesource.com/c/platform/build/+/1605133

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8da24e1ac900c1ffb5e42d0ffa3aa5997aa03a6b
 2021-02-24 18:27:04 +00:00
Roman Kiryanov 52037cf027 Merge "Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"" 2021-02-24 18:26:30 +00:00
Joe Onorato 2dba15bd2e Merge "ALLOW_RULES_IN_PRODUCT_CONFIG" am: 6af489099a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1598613

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5d2194f8d3e8b9cd5f5d7499cd27041d5919d15
 2021-02-24 18:26:11 +00:00
Joe Onorato 6af489099a Merge "ALLOW_RULES_IN_PRODUCT_CONFIG" 2021-02-24 17:43:37 +00:00
Devin Moore 93934ba177 Merge "Support vendor bootconfig creation" am: fd4f3c4c63 
Original change: https://android-review.googlesource.com/c/platform/build/+/1579696

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7528a81e41df69cd932a40eaeeea7a1651f366b8
 2021-02-24 16:40:07 +00:00
Devin Moore fd4f3c4c63 Merge "Support vendor bootconfig creation" 2021-02-24 15:56:48 +00:00
Christoffer Quist Adamsen d3fa1a2a5e Merge "Allow missing classes in R8 mk builds" am: 3bae96b3b0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1598221

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91ba1c91e33a8364a0ec11241a14358128f7c1e5
 2021-02-24 08:14:57 +00:00
Christoffer Quist Adamsen 3bae96b3b0 Merge "Allow missing classes in R8 mk builds" 2021-02-24 07:25:18 +00:00
Joe Onorato 01dfa5b3df Merge "Generate FlatConfig objects from GenericConfig objects." am: fbabf70394 
Original change: https://android-review.googlesource.com/c/platform/build/+/1580999

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18eff3e57f0d00b2858cd9e755cbcc8747bb0cc3
 2021-02-24 06:57:54 +00:00
Joe Onorato 749c1955a2 ALLOW_RULES_IN_PRODUCT_CONFIG 
If ALLOW_RULES_IN_PRODUCT_CONFIG is set, pass it to kati via
.KATI_ALLOW_RULES, to issue warnings or errors about rules
during product configuration.

Test: CHECK_FOR_RULES=true ./build/make/tools/product_config/test.sh
Test: ALLOW_RULES_IN_PRODUCT_CONFIG=error m nothing
Test: ALLOW_RULES_IN_PRODUCT_CONFIG=warning m nothing
Test: m nothing
Change-Id: I35dd9ffe4ec71f97beaa8b8a2f10d80502088af2
 2021-02-23 22:40:39 -08:00
Joe Onorato fbabf70394 Merge "Generate FlatConfig objects from GenericConfig objects." 2021-02-24 05:57:33 +00:00
Inseob Kim 6952cb3583 Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish" 
This reverts commit 05d595194b.

Reason for revert: fixed all goldfish properties

Change-Id: I7b6bf6c4fa94e0d6ba44dbc37b6451291e8fc9ad
 2021-02-24 05:27:18 +00:00
Treehugger Robot 7f4ae8df3c Merge "Creates a combined split-sepolicy file in merge_target_files.py." am: 2793fd2e6d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1578904

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33de196cbbf5285cdfaa7a637db1ecb9381f6bf6
 2021-02-24 04:26:56 +00:00
Treehugger Robot 2793fd2e6d Merge "Creates a combined split-sepolicy file in merge_target_files.py." 2021-02-24 03:50:44 +00:00
Treehugger Robot e15ec38deb Merge "Add non-fatal mode for verify_uses_libraries check." am: c66465a4b0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1592373

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36b852e328b5cd7f993766be01db2835dc67a80c
 2021-02-24 01:30:04 +00:00
Anton Hansson b862d0948e Merge "Disallow use of error-prone merge-strategies" am: 68892c49df 
Original change: https://android-review.googlesource.com/c/platform/build/+/1602016

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa777b5cc115ecdefadffe1548884b9834a00f43
 2021-02-24 01:25:59 +00:00
Treehugger Robot c66465a4b0 Merge "Add non-fatal mode for verify_uses_libraries check." 2021-02-23 20:45:42 +00:00
Daniel Norman 48603ff158 Creates a combined split-sepolicy file in merge_target_files.py. 
This follows the same steps as OpenSplitPolicy() in
system/core/init/selinux.cpp on the device.

Bug: 178864050
Test: merge_target_files for R+S and S+S devices
Test: test_merge_target_files
Change-Id: Ia41a436bfda8e2cb65706122f0ff3805b99d16e1
 2021-02-23 11:41:29 -08:00
Anton Hansson 68892c49df Merge "Disallow use of error-prone merge-strategies" 2021-02-23 18:29:05 +00:00
Devin Moore 50509015bf Support vendor bootconfig creation 
Gather all BOARD_BOOTCONFIG parameters.
Create vendor-bootconfig.img with parameters seperated by newlines. Pass
that file to mkbootimg as --vendor_bootconfig to add it to the
vendor_boot.img.

Test: Add BOARD_BOOTCONFIG parameters in cuttlefish .mk file
      Check vendor-bootconfig.img for expected output
      Verify expected vendor_boot.img format with:
      unpack_bootimg --boot_image vendor_boot.img
Test: Update Cuttlefish bootloader to handle the new vendor_boot.img and
      check /proc/bootconfig for the expexted parameters.
Bug: 173815685
Change-Id: Iaa9b71b4bc64375777a5353396e83bb2beb25c47
 2021-02-23 07:42:05 -08:00
Treehugger Robot 16de8e81ee Merge "Rename rgrep to rsgrep" am: 157e6a06e4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1599796

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7ce01474447eceb35cb645b1ccab1a03d612ff7
 2021-02-23 15:21:29 +00:00
Anton Hansson 62328d8519 Disallow use of error-prone merge-strategies 
Test: No
Change-Id: I6b573c4bfeddfe14ef035e63238747577450a78c
 2021-02-23 15:07:02 +00:00
Treehugger Robot 157e6a06e4 Merge "Rename rgrep to rsgrep" 2021-02-23 11:31:19 +00:00
TreeHugger Robot 1ba06032f2 Merge "Merge ab/7061308 into stage." into stage-aosp-master 2021-02-23 08:43:06 +00:00