openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
67,414 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

67414 Commits

Author SHA1 Message Date
Joe Onorato 8523601ce9 Generate GenericConfig objects from MakeConfig objects. 
Applies heuristics to the sequence of Blocks to do so.

Test: rm -rf out/config/ && m product-config-test product-config && java -jar out/host/linux-x86/testcases/product-config-test/product-config-test.jar && time ( out/host/linux-x86/bin/product-config --ckati_bin /source/kati/ckati > ~/Desktop/out.txt )
Change-Id: Id6763781bc876e2b2e0be320a7259c1ed41c2334
 2021-02-17 10:02:41 -08:00
Joe Onorato f20c93afa3 Emit and parse the product config variables from kati/make 
Test: cls && rm -rf out/config/ && m product-config-test product-config && java -jar out/host/linux-x86/testcases/product-config-test/product-config-test.jar && time ( product-config --ckati_bin /source/kati/ckati > ~/Desktop/out.txt )
Change-Id: I52e5c07f9aaf899f9d45680313275c6d9e246ff2
 2021-02-17 10:02:41 -08:00
Joe Onorato 9de9652582 Add class to fork and exec kati, based on the commandline option given. 
Test: m product-config-test && java -jar out/host/linux-x86/testcases/product-config-test/product-config-test.jar
Change-Id: I4706e32ff7ac4424b6835b94fef40a2c838f8492
 2021-02-17 10:02:41 -08:00
Joe Onorato 7c01d47c9a Add a CSV parser to parse the output from kati. 
(Yet another class that would be great for android to have in a host
tools library)

Test: m product-config-test && java -jar out/host/linux-x86/testcases/product-config-test/product-config-test.jar
Change-Id: I7d74b2265393e4f340729ca5ba82d1ec92a20f85
 2021-02-17 10:02:41 -08:00
Jeongik Cha 248ee9f249 update vndk list 
Test: m
Bug: 150578172
Change-Id: I98fa56d527124008fc60d60a7f45f200f20e5707
Merged-In: Ic53702ede81f9edbc8e29e92df4470b99b696098
 2021-02-17 15:58:18 +00:00
Martin Stjernholm 41e93101ef Merge "Move ART APEX selection logic to core make." am: 43d4040f6f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1580593

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22eb19d2aa30eae03566a884dd5acbd1da7cfa3e
 2021-02-17 13:17:43 +00:00
Martin Stjernholm fa83228660 Move the logic to add jacocoagent in instrumentation builds to make. 
This to allow operating on the complete ART_APEX_JARS list from make in
a follow-up CL.

Test: m nothing
Test: m nothing EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true
Bug: 180325915
Change-Id: Ic08148edf25738f6f4769e5359a573237a38b0e9
 2021-02-17 12:55:49 +00:00
Martin Stjernholm 43d4040f6f Merge "Move ART APEX selection logic to core make." 2021-02-17 12:44:23 +00:00
Treehugger Robot 3f237296b3 Merge "Mark PRODUCT_SUPPORTS_xxx variables as single item instead of list" am: 69ac4b21cd 
Original change: https://android-review.googlesource.com/c/platform/build/+/1584369

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I596b6c3c480af33434e0a4350e614201828ee7fa
 2021-02-17 10:47:19 +00:00
Treehugger Robot 69ac4b21cd Merge "Mark PRODUCT_SUPPORTS_xxx variables as single item instead of list" 2021-02-17 10:28:51 +00:00
Martin Stjernholm c481de01b7 Move ART APEX selection logic to core make. 
It's moved from art/Android.mk that won't be available in platform
builds without ART sources.

This also ensures we depend on com.android.art directly on
PRODUCT_PACKAGES and not through LOCAL_REQUIRED_MODULES which was the
case in com.android.art-autoselect. When com.android.art is overridden
through an `overrides` field, the logic in main.mk drops it from
PRODUCT_PACKAGES, but it doesn't consider overrides when processing
LOCAL_REQUIRED_MODULES dependencies.

Bug: 172480617
Test: `m` with PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD
  set to true and false
Test: `m` on userdebug and eng builds
Change-Id: Ia606de691fe20ac19f2ca9af362408606e71b11c
 2021-02-17 08:28:07 +00:00
Treehugger Robot b1cb721609 Merge changes from topic "vendor_property_enforce" am: 32b84909a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1571847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6fe47933b9600784a0490663250d535259162f58
 2021-02-17 07:47:40 +00:00
Inseob Kim e4cd7c8c34 Add BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE to BoardConfig am: 43f4ef0221 
Original change: https://android-review.googlesource.com/c/platform/build/+/1571846

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d9e63485641d92b16ce58007dabf083c6760e2f
 2021-02-17 07:47:34 +00:00
Inseob Kim 59ac4ba1a9 Add PRODUCT_SHIPPING_API_LEVEL to productVariables am: a0884b90ae 
Original change: https://android-review.googlesource.com/c/platform/build/+/1532065

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6529c13595544ca77108b30caaac9aaf0819b4fa
 2021-02-17 07:47:15 +00:00
Treehugger Robot 32b84909a1 Merge changes from topic "vendor_property_enforce" 
* changes:
  Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish
  Add BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE to BoardConfig
  Add PRODUCT_SHIPPING_API_LEVEL to productVariables
 2021-02-17 07:12:30 +00:00
Treehugger Robot 4e65e3d319 Merge "Remove LOCAL_LICENSE_KINDS from core makefiles." am: 6d89e4a9e1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1589812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36309b81f9fc021d3a4b2835f643a07e80e6248f
 2021-02-16 17:55:54 +00:00
Treehugger Robot 6d89e4a9e1 Merge "Remove LOCAL_LICENSE_KINDS from core makefiles." 2021-02-16 17:30:47 +00:00
Bob Badour 17831e3da3 Remove LOCAL_LICENSE_KINDS from core makefiles. 
Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I4deec3e07862e89dd32880774efb4624a9723cf2
 2021-02-16 04:37:23 -08:00
Treehugger Robot 27d927752e Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: 14201eb3a3 
Original change: https://android-review.googlesource.com/c/platform/build/+/1589084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie84c75d37f4f3a79aee3fa75f304eae1e1a7fee3
 2021-02-15 23:48:06 +00:00
Treehugger Robot 14201eb3a3 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" 2021-02-15 23:21:48 +00:00
Martin Stjernholm 20c9c03ba7 Merge "Build the ART modules from source if they are listed in TARGET_BUILD_APPS." am: ae2af082ca 
Original change: https://android-review.googlesource.com/c/platform/build/+/1587752

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0689ec5821c87d7dee17989782ae86bbc24a6c98
 2021-02-15 11:19:00 +00:00
Martin Stjernholm ae2af082ca Merge "Build the ART modules from source if they are listed in TARGET_BUILD_APPS." 2021-02-15 10:53:50 +00:00
Yo Chiang d7c8c787fd Merge "Kernel modules: add modules.blocklist build support" am: b84604198c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1575046

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ab6a5f1d71f64e157227a273035ac372c1eb956
 2021-02-15 07:18:17 +00:00
Yo Chiang b84604198c Merge "Kernel modules: add modules.blocklist build support" 2021-02-15 06:45:57 +00:00
Bob Badour 0390580262 [LSC] Add LOCAL_LICENSE_KINDS to build/make 
Added SPDX-license-identifier-Apache-2.0 to:
  target/product/sysconfig/Android.bp
  tools/apicheck/Android.bp
  tools/product_config/Android.bp
  tools/releasetools/Android.bp
  tools/signapk/Android.bp
  tools/signtos/Android.bp
  tools/zipalign/Android.bp
  tools/ziptime/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CC-BY SPDX-license-identifier-GPL
    SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL
    SPDX-license-identifier-MIT legacy_not_a_contribution
    legacy_restricted
to:
  Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CC-BY SPDX-license-identifier-GPL
    SPDX-license-identifier-MIT
to:
  tools/Android.bp
  tools/droiddoc/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
    SPDX-license-identifier-LGPL SPDX-license-identifier-MIT
to:
  core/base_rules.mk
  core/dex_preopt_libart.mk
  core/package_internal.mk

Added SPDX-license-identifier-Apache-2.0 legacy_not_a_contribution
to:
  target/board/Android.mk

Added legacy_restricted
to:
  core/tasks/tools/package-modules.mk
  target/product/gsi/Android.bp
  target/product/gsi/Android.mk
  target/product/security/Android.bp
  target/product/security/Android.mk
  tools/acp/Android.bp
  tools/atree/Android.bp
  tools/fs_config/Android.bp
  tools/fs_config/Android.mk
  tools/fs_get_stats/Android.bp
  tools/libhost/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Id67a4eb1312940f999643b2ae57f45f34f120724
 2021-02-14 10:37:20 -08:00
Yo Chiang 384b0b319a Merge "Revert "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk"" am: 25d0acf00f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1588251

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0c1996abb31ce4787eb166f3c1b2cbb2147f2b8
 2021-02-13 09:09:23 +00:00
Yo Chiang 25d0acf00f Merge "Revert "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk"" 2021-02-13 06:09:36 +00:00
Yo Chiang 1178673d5e Revert "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk" 
This reverts commit ecaa592310.

Reason for revert: b/177495407#comment9 breaks aosp_arm

Exempt-From-Owner-Approval: Clean revert

Change-Id: If4586901fc1806c5394a385c8686ef5fd8748f24
 2021-02-13 06:08:54 +00:00
Martin Stjernholm f4bf5d5e62 Build the ART modules from source if they are listed in 
TARGET_BUILD_APPS.

Test: Run build_mainline_modules.sh and check that
      SOONG_CONFIG_art_module_source_build is true even if the fallback
      default is false.
Bug: 172480615
Change-Id: Ie0e9566d4d09b1e54af00c06021aa355adcf0a1a
 2021-02-12 21:20:40 +00:00
Ulyana Trafimovich 3111c4a5c1 Merge "Preserve <uses-library> order in dexpreopt.config files." am: e5511ed739 
Original change: https://android-review.googlesource.com/c/platform/build/+/1584867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I511e0a01b3e4536aa44568266a54ff2e691bb6e0
 2021-02-12 10:50:47 +00:00
Ulyana Trafimovich e5511ed739 Merge "Preserve <uses-library> order in dexpreopt.config files." 2021-02-12 10:22:39 +00:00
Yo Chiang e42e3a293b Merge "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk" am: 2ecbebdcd2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1553835

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ab7a853dceaae32bf6d35211d83dd20c6ae4903
 2021-02-12 10:08:43 +00:00
Yo Chiang 2ecbebdcd2 Merge "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk" 2021-02-12 09:35:55 +00:00
Chih-Hung Hsieh 2e4fdbdda1 Do not append empty DEFAULT_TIDY_HEADER_DIRS 
* Default value will be empty and not work in -header-filter.

Bug: 179530304
Test: make with WITH_TIDY=1 and various setting of DEFAULT_TIDY_HEADER_DIRS
Change-Id: I3f784f545acd12285a5bf6dcae1bab42c9185fe7
 2021-02-11 22:36:04 -08:00
Treehugger Robot 484b38abc0 Merge "Fix error where otacerts in VENDOR_BOOT isn't replaced" am: 3c1a6ee5ad 
Original change: https://android-review.googlesource.com/c/platform/build/+/1585506

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7bfd53d68d1a0e05134c7cf38564b535bb10118c
 2021-02-12 06:23:15 +00:00
Treehugger Robot 3c1a6ee5ad Merge "Fix error where otacerts in VENDOR_BOOT isn't replaced" 2021-02-12 06:06:11 +00:00
Treehugger Robot fe91376e45 Merge "Fix signing errors where some partitions aren't properly signed" am: ba106847ff 
Original change: https://android-review.googlesource.com/c/platform/build/+/1583044

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb540ef7dd15d5354d175266f4b5327b131c2604
 2021-02-12 05:25:30 +00:00
Treehugger Robot e4165d37bf Merge changes Icd25d2d0,I39ef10b0,I06bb80fe am: d3f5268dfb 
Original change: https://android-review.googlesource.com/c/platform/build/+/1554917

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad2825ed6072f276b51594fb382b23220a6f6cc4
 2021-02-12 05:25:01 +00:00
Treehugger Robot c4a28af710 Merge "Check for existence of private key before generating OTA" am: 2adfd28cdb 
Original change: https://android-review.googlesource.com/c/platform/build/+/1581144

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia180da93cfe14bcf9190a2366df41b4695696e6f
 2021-02-12 05:21:16 +00:00
Treehugger Robot 3f9b50a2bd Merge "Prevent SPL downgrade OTAs from generating" am: 28aab78e53 
Original change: https://android-review.googlesource.com/c/platform/build/+/1581143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93838ef94f6d132d5d889e59fbb4cb2e293c33b6
 2021-02-12 05:17:15 +00:00
Treehugger Robot ba106847ff Merge "Fix signing errors where some partitions aren't properly signed" 2021-02-12 04:29:44 +00:00
Treehugger Robot d3f5268dfb Merge changes Icd25d2d0,I39ef10b0,I06bb80fe 
* changes:
  Rearrange the methods on ErrorReporter to be more convenient.
  Add glue to run product-config-test as a standalone commandline executable.
  CommandException to cleanly exit product-config on error.
 2021-02-12 04:03:44 +00:00
Treehugger Robot 2adfd28cdb Merge "Check for existence of private key before generating OTA" 2021-02-12 02:32:03 +00:00
Treehugger Robot 28aab78e53 Merge "Prevent SPL downgrade OTAs from generating" 2021-02-12 02:28:59 +00:00
Kelvin Zhang 9f781ff907 Fix error where otacerts in VENDOR_BOOT isn't replaced 
Test: sign a target_file, check otacerts.zip
Bug: 180025432

Change-Id: I918c3772a6de83314d76884dff3b26a85ed66eb2
 2021-02-11 20:14:24 -05:00
Kelvin Zhang 119f279455 Fix signing errors where some partitions aren't properly signed 
Rewrite build.prop of all partitions

Test: sign an target_file, check build prop of partitions

Bug: 179186447
Bug: 180025432

Change-Id: I01249532dc2df1b6d9ec8d0be58424a76814b53e
 2021-02-11 19:51:05 -05:00
Kelvin Zhang eb586efe6f Check for existence of private key before generating OTA 
At the end of OTA generation, we will use some private key to sign the
OTA payload. Since signing happens after the payload is being generated,
if caller passes an incorrect key path, caller won't notice it until 1
hour later when delta_generator finishes. At which point caller has to
staart from scratch, pass in another key path, and wait for an hour.
Let's detect incorrect key path before calling delta_generator, so
caller will get an error message right at beginning.

Test: th
Change-Id: Iefb1e0a9ed86f82664be1675afb84c020ec28fe7
 2021-02-11 19:06:09 -05:00
Kelvin Zhang 80ff466780 Prevent SPL downgrade OTAs from generating 
Previously we allow all spl downgrade OTA to generate. But applying such
OTA often causes device to hang and rollback, because keymaster refuses
to attach if it detects spl downgrade. When such error happens, it's
really hard to debug. So instead of debugging a mysterious boot failure,
let''s prevent such OTA from generating in the first place.

Test: th
Bug: 178584781

Change-Id: I8e271862d804e86b16aea70424b4d3e289d43cc9
 2021-02-11 19:06:08 -05:00
Peter Kalauskas 449e59c8fb Merge "Fix pm.dexopt.first-boot for eng builds" am: a632e7f855 
Original change: https://android-review.googlesource.com/c/platform/build/+/1584212

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic426d540a6103a9834bcdfda8bfbd908be98707a
 2021-02-11 19:43:08 +00:00
Peter Kalauskas a632e7f855 Merge "Fix pm.dexopt.first-boot for eng builds" 2021-02-11 18:57:45 +00:00