Commit Graph

18402 Commits

Author SHA1 Message Date
Yifan Hong
b321665b9d Build ODM manifests and fragments for each SKU.
In BoardConfig.mk, ODM manifests can be specify as follows:

    # installed to /odm/etc/vintf/manifest.xml
    ODM_MANIFEST_FILES := device/foo/bar/odm_manifest.xml

    # installed to /odm/etc/vintf/manifest_baz.xml
    ODM_MANIFEST_SKUS := baz
    ODM_MANIFEST_BAZ_FILES := device/foo/bar/odm_manifest_baz.xml

This is preferred over PRODUCT_COPY_FILES because it uses
assemble_vintf to check manifest at build time.

Test: builds

Change-Id: I18517b8ba09d3271627d6f21b8250b1bfc9e5db3
2019-02-19 12:37:50 -08:00
Yu Shan
655f17cf88 Add 32BIT and 16BIT nanopb library.
Add 32BIT and 16BIT compile time flag for nanopb library to support
16BIT or 32BIT size, default is 8BIT. User need to use the corresponding
library when define the PB_FIELD_* flag during compilation.

Change-Id: I0d25bcdf62d6b47733e1ad4bddbd4dfce2192b5d
Test: None
Bug: 122292884
2019-02-19 12:01:43 -08:00
Jiyong Park
bcc8d8a2d4 Install apexkeys.txt into the target-files package
The file contains information about apex-to-keys mappings.

Bug: 124406181
Test: m dist and check if META/apexkeys.txt file exist in the
target-files package.

Change-Id: If8da917a8b4d4e8326614b34067c14ed0df59cb3
2019-02-19 14:18:46 +09:00
Colin Cross
dd025116cd Merge "Remove dexpreopting of boot jars from Make" 2019-02-19 02:55:16 +00:00
Bowgo Tsai
f509e54bd0 Merge "Support verifying system_other"
am: 01a05483ed

Change-Id: I343ac68c70195d2c9e035b92ef44f196fe731deb
2019-02-17 21:34:32 -08:00
Treehugger Robot
01a05483ed Merge "Support verifying system_other" 2019-02-18 05:21:27 +00:00
Jeongik Cha
d9182b546c Merge "Clean up noisy error log in find-shareduid-violation.py"
am: 50b4b395bc

Change-Id: I643ffdb62536e48c288ab6cfe902e081908213d1
2019-02-16 20:29:46 -08:00
Treehugger Robot
50b4b395bc Merge "Clean up noisy error log in find-shareduid-violation.py" 2019-02-17 04:19:41 +00:00
Roman Kiryanov
af38e1765f Merge "Use predefined macros instead of hardcoding the path"
am: 06ec0577b6

Change-Id: I96baf1b12e11d7e7a4c4863dc9ed3c22c97c0568
2019-02-16 15:07:43 -08:00
Treehugger Robot
06ec0577b6 Merge "Use predefined macros instead of hardcoding the path" 2019-02-16 22:56:47 +00:00
Jeongik Cha
b806c44326 Clean up noisy error log in find-shareduid-violation.py
The script makes noisy error although fallback cmd succeed.

So make the script writes error log only if both of commands fail.

Bug: 124470143
Bug: 123664116
Test: m -j out/target/product/$(get_build_var TARGET_DEVICE)/shareduid_violation_modules.json
Test: And there is no error log in stderr
Change-Id: I3d4756066ee6904826c18754969fd4190bd02e1e
2019-02-16 10:50:56 +09:00
Bill Peckham
19d6b0fbe5 Merge "Include soong_zip in OTA tools package."
am: f3c50438c3

Change-Id: Ice539fef08bd66a82cb6b2ba60d4c7da617fc9eb
2019-02-15 16:45:54 -08:00
Bill Peckham
f3c50438c3 Merge "Include soong_zip in OTA tools package." 2019-02-16 00:38:07 +00:00
Roman Kiryanov
27a67bac5c Merge "Check INSTALLED_SYSTEMIMAGE_TARGET to build INSTALLED_QEMU_SYSTEMIMAGE"
am: 7848e3cfef

Change-Id: Icf2c7e630bd5009b78015ef6aa275e7c199cd5eb
2019-02-15 16:12:21 -08:00
Treehugger Robot
7848e3cfef Merge "Check INSTALLED_SYSTEMIMAGE_TARGET to build INSTALLED_QEMU_SYSTEMIMAGE" 2019-02-15 23:53:03 +00:00
Colin Cross
47e384c3d6 Remove dexpreopting of boot jars from Make
Dexpreopting of boot jars is now implemented in
build/soong/java/dexpreopt_bootjars.go.

Test: m checkbuild
Change-Id: I036510e7674b876976ce191c5b18bf0b7a15c6ee
2019-02-15 13:00:14 -08:00
Bill Peckham
eabb713f15 Include soong_zip in OTA tools package.
Including soong_zip in the OTA tools package enables its use in target files
repackaging scripts.

Bug: 124468071
Test: Generate build, verify that soong_zip exists in otatools.zip at bin/soong_zip
Change-Id: Iee0d9dba73a66de4d1aa6970dd8fb8debb723660
2019-02-15 11:25:34 -08:00
Colin Cross
a78af927a9 Merge "Fix resource overlay order for static libraries"
am: dba735e9a5

Change-Id: Ibeb88897c5b532fb4c3cb2935641fe555f05dc46
2019-02-15 11:10:36 -08:00
Colin Cross
dba735e9a5 Merge "Fix resource overlay order for static libraries" 2019-02-15 18:54:49 +00:00
Roman Kiryanov
4985cc829d Use predefined macros instead of hardcoding the path
There are predefined macros image targets that are
already checked in dependencies, use them instead
of hardcoding the same path again.

Bug: 79601115
Test: make -j
Change-Id: I12b64a646df038de017ba2ef18f3d0e4274f7caa
Signed-off-by: Roman Kiryanov <rkir@google.com>
2019-02-15 10:38:02 -08:00
Roman Kiryanov
e64998fe3b Check INSTALLED_SYSTEMIMAGE_TARGET to build INSTALLED_QEMU_SYSTEMIMAGE
This change checks if INSTALLED_SYSTEMIMAGE_TARGET
is defined to generate INSTALLED_QEMU_SYSTEMIMAGE
to improve debugging.

Bug: 79601115
Test: make -j
Change-Id: Ia1aad7dbaab1d2de11a1bc3ffe7c7ae714f5f6eb
Signed-off-by: Roman Kiryanov <rkir@google.com>
2019-02-15 10:37:54 -08:00
Colin Cross
3b6b01b04a Merge "Add missing hiddenapi product variables to Soong config"
am: 569478f046

Change-Id: I0c9cd744aeb06aa87b87631b636362cd069eca18
2019-02-14 20:05:11 -08:00
Treehugger Robot
569478f046 Merge "Add missing hiddenapi product variables to Soong config" 2019-02-15 03:47:31 +00:00
Sasha Smundak
f897629a58 Add a wrapper file for the vts_config module.
See https://android-review.googlesource.com/c/platform/build/soong/+/905013

Bug: 122617100
Test: treehugger
Change-Id: I3e1614bc9009c00132d0fc3500bdd4491055320a
2019-02-14 18:13:36 -08:00
Xin Li
673fa32bc7 Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master 2019-02-14 22:11:35 +00:00
Colin Cross
36f79c4be6 Add missing hiddenapi product variables to Soong config
If72bd1c20b2014d0a3d400624d37fdb0a3052245 failed to propagate
PRODUCT_HIDDENAPI_STUBS* to Soong.

Bug: 124316921
Test: m out/soong/hiddenapi/hiddenapi-flags.csv, check previously
      blacklisted classes are now whitelisted.

Change-Id: I9b4a364654bad77b38ceb7062dafaeeab5f49517
2019-02-14 11:22:02 -08:00
Benjamin Gordon
b8bf92e6b8 Add stoney ridge x86 variant
Bug: 124445930
Test: compile and deploy to grunt
Change-Id: Ia73c27f7ce9ca9031e733a3754ffbb2fabeae4d0
2019-02-14 11:03:00 -07:00
android-build-team Robot
de4669b4a2 Make change and version bump to PQ2A.190405.003
Change-Id: Ieff87cfad4da8e42b43b98b0e819fbdefbab56c2
2019-02-14 16:27:06 +00:00
Elisa Pascual Trevino
4e41f65503 Update Security String to 2019-04-05
Bug: 124119313
(cherry picked from commit 0b5a344dc3)

Change-Id: I1a68d374fd1935e7b37b9665dfca7d782055b4c8
2019-02-14 16:24:14 +00:00
android-build-team Robot
cbe4d3231a Version bump to PQ2A.190405.002
Change-Id: I317fd68333a1b5923ae9b30b200f523fe50d508f
2019-02-14 14:38:20 +00:00
android-build-team Robot
9886f404c2 Version bump to PQ2A.190405.001
Change-Id: Iddf273fbbb2ff7efabdf298e29ce100247f89f24
2019-02-14 14:04:31 +00:00
Logan Chien
87ec538ef1 Merge "Strip LOCAL_CHECK_ELF_FILES" 2019-02-14 10:20:28 +00:00
Logan Chien
e87ff2d85f Strip LOCAL_CHECK_ELF_FILES
This commit strips LOCAL_CHECK_ELF_FILES before comparing it with
`false` so that developers can add comments after LOCAL_CHECK_ELF_FILES.
For example:

    LOCAL_CHECK_ELF_FILES := false  # disable checks due to ...

Bug: 119084334
Test: Add some spaces after LOCAL_CHECK_ELF_FILES and run
      CHECK_ELF_FILES=true make check-elf-files
Change-Id: I2bfaff4807aeeea6c7af0b9d7d716742b6764cd0
2019-02-14 14:30:09 +08:00
Treehugger Robot
6eeef21b9d Merge "Drop /root when installing symbols" 2019-02-14 05:27:44 +00:00
Treehugger Robot
07603d63f6 Merge "Generate API XML files from android stub targets instead of text input." 2019-02-14 05:19:34 +00:00
Colin Cross
b11fc29b13 Fix resource overlay order for static libraries
If a static library has static library dependencies then all resources
need to be moved to an overlay to maintain the correct ordering so
that a static library resource overlays the same resource in a
dependency.

Bug: 124108931
Test: m checkbuild
Change-Id: I6be9a80c53e6247a6589272ab0e653a9a0ded814
2019-02-14 03:34:57 +00:00
Treehugger Robot
bee89836c7 Merge "DAP: system_as_root can't be true." 2019-02-14 02:09:20 +00:00
Logan Chien
e083c26a19 Merge changes I2f2a7df5,I84ff9f61
* changes:
  Check ELF files in both paths
  Add system shared libs to a prebuilt_internal.mk path
2019-02-14 01:53:27 +00:00
Allen Hair
191f0e5b60 Generate API XML files from android stub targets instead of text input.
The resulting XMLs will contain more complete information (such as
whether or not a method is native) than is available in current.txt.

Bug: 124335876
Test: make PRODUCT-cf_x86_phone-userdebug showcommands dist EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true tests

Change-Id: Icb8999bcd6be28f3ec8ff6bffa33b261f0d20606
2019-02-13 17:48:00 -08:00
Pirama Arumuga Nainar
5aab10f40d Merge "Enable coverage only when LOCAL_SDK_VERSION > 23" 2019-02-14 00:05:57 +00:00
Yifan Hong
f84c7e5c8f DAP: system_as_root can't be true.
Test: builds
Change-Id: I3e47e9717c983703494abc8417526caf5955d2e4
Fixes: 124274480
2019-02-13 15:08:33 -08:00
android-build-team Robot
af2091dc1b Version bump to PQ2A.190401.002
Change-Id: I18282ec17af9201d2a169b9300cb3b64de51c745
2019-02-13 19:16:40 +00:00
Colin Cross
dc53f450af Make copy-many-files take an optional destination directory
Test: m checkbuild
Change-Id: I777952d27bd1a0cf2608e080a0f46e39268784ce
2019-02-13 08:03:25 -08:00
Nicolas Geoffray
cd75414f1e Merge "Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system.""" 2019-02-13 11:59:39 +00:00
Anton Hansson
2582554c42 Merge "Move dump-products back to the config stage" 2019-02-13 09:12:30 +00:00
Bowgo Tsai
45db7cefb3 Support verifying system_other
This commit extracts the AVB key used to sign system_other.img into
system.img, for init to verify system_other's AVB metadata.

The extracted key will locate in:
    /system/etc/security/avb/system_other.avbpubkey

Bug: 123611926
Test: build and checks the following is generated
      $OUT/system/etc/security/avb/system_other.avbpubkey

Change-Id: Icdc703ff5a0d50f8140bb652507b9b4cbc8a2118
2019-02-13 17:00:49 +08:00
Colin Cross
8f4e0f2939 Merge "Move dexpreopt image selection out of dexpreopt_gen" 2019-02-13 01:00:49 +00:00
Treehugger Robot
cb52058f8f Merge "Adding per-partition SPL into AVB prop descriptors" 2019-02-12 23:30:13 +00:00
Treehugger Robot
5afd3dc00e Merge "Obsolete add_lunch_combo" 2019-02-12 23:22:50 +00:00
Tom Cherry
8bca10ade4 Merge "Remove TARGET_ANDROID_FILESYSTEM_CONFIG_H" 2019-02-12 21:10:41 +00:00