Commit graph

59062 commits

Author SHA1 Message Date
Joe Onorato
02fb89a4d7 Add mk2bp_catalog.py that outputs more data about makefiles to be converted to soong.
- Adds makefile and which files are installed to the SOONG_CONV CSV file
- Updates soong_to_convert.py to be able to parse that
- Adds new script that is more detailed.
- Outputs that file as part of the droidcore build to
  $(OUT_DIR)/target/product/$(TARGET_DEVICE)/mk2bp_remaining.html

Test: m out/target/product/$(get_build_var TARGET_DEVICE)/mk2bp_remaining.html
Change-Id: I7c380b6070754f4329bf3965595751e4dac794a0
2020-07-16 18:19:15 -07:00
Yo Chiang
7c16b443c3 Merge "Refine dump-files" 2020-07-15 07:24:41 +00:00
Hung-ying Tyan
6fa0dd9b94 Merge "Enable vbmeta_system for GSI targets" 2020-07-15 06:34:34 +00:00
Tianjie Xu
8542706908 Merge "Use apksigner in check_target_files_signatures" 2020-07-15 03:25:25 +00:00
Tianjie
a9a50cf6e3 Use apksigner in check_target_files_signatures
Some apk files, e.g. Chrome.apk has switched to use v2+ scheme.
And the apk file no longer has a META-INF/CERT.RSA. So, the
signature parsing script should use apksigner to dump the cert
info.

Leave the parsing of META-INF/CERT.RSA as a fallback, as some apks
fail the `apksigner verify`. The script also switches to store the
digest of the cert instead of the raw bytes.

Bug: 157735036
Test: run check_target_files_signatures on aosp|signed target-files

Change-Id: I910cd1aa91d1e446bef7097871af4171c285685d
2020-07-14 17:23:07 -07:00
Yifan Hong
6323e8b880 Merge changes from topic "vendor_dlkm"
* changes:
  Add vendor_dlkm/etc/build.prop
  Install dlkm to appropriate place and symlink
  Add notice files for vendor_dlkm
  Add vendor_dlkm partition.
2020-07-14 19:15:12 +00:00
Hung-ying Tyan
1785816ca1 Enable vbmeta_system for GSI targets
in order to mix GSI onto android10 Cuttlefish.

Bug: 158302764
Test: mixing GSI onto android10 Cuttlefish
Change-Id: I77385495583034324f5e29bed27c588dc98215e2
2020-07-14 16:04:20 +00:00
Treehugger Robot
5469096fbf Merge "Changes.md: Format section BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES" 2020-07-14 11:11:29 +00:00
Yo Chiang
561efbc1fb Refine dump-files
Dump $(modules_to_install) instead of $(product_target_FILES) to get a
more complete list of target files.

Use `echo $(modules_to_install) | tr -s ' ' '\n'` instead of
`$(foreach m,$(modules_to_install),$(info $(m)))`.
This way only one `echo` command is emitted instead of emitting `echo`
command for each file. This speeds up the invocation speed tremendously.

Bug: 159195410
Test: m dump-files
Change-Id: I06549cecc64177f1eb5a01e31a55d5eed307fcfd
2020-07-14 18:30:34 +08:00
Yo Chiang
d4741817e3 Changes.md: Format section BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES
Quote Make variable names in backtick and add section anchor.

Test: preview in gittiles
Change-Id: Ia661090f42d2191ca6a52dd9168d270100c488ad
2020-07-14 15:15:08 +08:00
Yifan Hong
51a971b1d5 Add vendor_dlkm/etc/build.prop
Test: builds and manual inspect
Bug: 156020364
Change-Id: Ic7606bc3cd8770ec56ddc7bea86c88625c38f32d
2020-07-13 14:20:56 -07:00
Yifan Hong
e51dff25ec Install dlkm to appropriate place and symlink
Test: builds
Bug: 156020364
Change-Id: I5958021ab54a2f99140796c3ef915b5329808ce3
2020-07-13 14:20:56 -07:00
Yifan Hong
3d3f030c27 Add notice files for vendor_dlkm
Test: pass
Bug: 156020364
Change-Id: I87e8b57a7a7f212071de4e530424740103a29434
2020-07-13 14:20:56 -07:00
Yifan Hong
cfb917a1c7 Add vendor_dlkm partition.
Test: define vendor_dlkm for CF.
Bug: 156020364

Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-07-13 14:20:56 -07:00
Patrice Arruda
4a2e443ec2 Merge "Set ANDROID_ENABLE_METRICS_UPLOAD to the metrics_uploader path to upload metrics." 2020-07-13 17:56:27 +00:00
Roland Levillain
18a4837e07 Merge "Turn COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into obsolete variables." 2020-07-13 14:31:26 +00:00
Colin Cross
3227fc587c Merge "Use unzip -DD" 2020-07-13 05:58:28 +00:00
Colin Cross
c27d795b63 Use unzip -DD
We put reproducible timestamps in zip files so that the artifacts
are consistent, but that leads to old timestamps in the output
directory if they are unzipped as part of the build.  Use
unzip -DD when unzipping to update the timestamps.

Bug: 161015009
Test: touch -d 2020-01-01 ref; find $OUT/system -not -newer ref
Change-Id: I6f08ba8695d90a8225cfc04e679755e6296deed0
2020-07-12 05:38:03 +00:00
Roland Levillain
ce637304a0 Merge "Revert^2 "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors."" 2020-07-11 14:32:10 +00:00
Patrice Arruda
d990f70fa2 Set ANDROID_ENABLE_METRICS_UPLOAD to the metrics_uploader path to upload metrics.
This is to collect metrics from our RBE dogfooders. This CL will be
rolledback once the metrics pipeline is turned live.

Bug: b/140638454
Test: source the script and then "m nothing". Monitored the uploading
      of the metrics.
Change-Id: Ide996a44a5a651ed026d7c8272283675fbb092b5
2020-07-10 23:22:49 +00:00
Julien Desprez
f7d4d1e885 Merge "Add new jar that will replace tradefed.jar" 2020-07-10 21:32:21 +00:00
Roland Levillain
be3c3719d4 Revert^2 "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors."
All known uses of environment variables `COVERAGE_PATHS` and
`COVERAGE_EXCLUDE_PATHS` (in AOSP and downstream branches) have
been replaced with `NATIVE_COVERAGE_PATHS` and
`NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

This reverts commit 62d9912677.

Reason for revert: The cause of the build breakages caused by the
initial change has been addressed.

Test: m nothing
Test: Check that `m nothing COVERAGE_PATHS=art` fails.
Test: Check that `m nothing COVERAGE_EXCLUDE_PATHS=art` fails.
Test: Check the Android Build for build errors related to these variables.
Bug: 158212027
Bug: 160769227
Change-Id: Ic267e1b61e84bc6f016a3eb57efe7f9b859adb42
2020-07-10 11:00:32 +00:00
Julien Desprez
b8f37694a3 Add new jar that will replace tradefed.jar
for compatibility with across branches, still need to
export tradefed.jar.

Test: make cts
Bug: 149758913
Change-Id: I101cba5dc3abe483b4dfbe6a113e24960e0e07ba
2020-07-09 15:31:35 -07:00
Kelvin Zhang
757fd2768e Merge "Fix validate_target_files for target files modified by" 2020-07-09 00:32:52 +00:00
Orion Hodson
be88cd9140 Merge "Revert "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors."" 2020-07-08 14:00:55 +00:00
Lais Andrade
62d9912677 Revert "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors."
This reverts commit ace5860719.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-dev-plus-aosp&target=build_test3&lkgb=6662220&lkbb=6662382&fkbb=6662228
Bug: 158212027
Bug: 160769227
Test: N/A revert
Change-Id: I0d366adcc735e9cc417d28013afb0386dea1fa64
2020-07-08 13:58:23 +00:00
Roland Levillain
cd80a6afea Turn COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into obsolete variables.
(cherry picked from commit c276bf4f3cc72e479d21c7bd0b34673d93e76f9a)

Test: m nothing
Bug: 158212027
Change-Id: Ibc0dbfd21465ab6fc5b826a52bf605910af283e7
Merged-In: Ibc0dbfd21465ab6fc5b826a52bf605910af283e7
2020-07-08 12:56:29 +01:00
Roland Levillain
01ce4a0b02 Merge "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors." 2020-07-08 10:07:51 +00:00
Treehugger Robot
faac5a2e7d Merge "Move build.prop to ./etc subdir for some partitions" 2020-07-08 00:03:30 +00:00
Jooyung Han
fb220803b6 Merge "Remove hidl VNDK libs" 2020-07-07 18:04:11 +00:00
Roland Levillain
ace5860719 Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors.
All known uses of environment variables `COVERAGE_PATHS` and
`COVERAGE_EXCLUDE_PATHS` have been replaced with
`NATIVE_COVERAGE_PATHS` and `NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

Test: m nothing
Test: Check that `m nothing COVERAGE_PATHS=art` fails.
Test: Check that `m nothing COVERAGE_EXCLUDE_PATHS=art` fails.
Test: Check the Android Build for build errors related to these variables.
Bug: 158212027
Change-Id: Icc7c1d9734e78c2bf327f00f04355700b5476648
2020-07-07 15:01:26 +01:00
Jooyung Han
861f077f09 Remove hidl VNDK libs
hidl libs are removed from VNDK unless used by other VNDK libs.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: I25a787defb1755107c0538eabd21a0bfcf8374b1
Change-Id: I25a787defb1755107c0538eabd21a0bfcf8374b1
(cherry picked from commit 9438fb2c15)
2020-07-07 16:20:41 +09:00
Bill Yi
3cea91a6f7 Merge "Merge android10-qpr3-release to aosp-master - DO NOT MERGE" 2020-07-07 07:14:49 +00:00
Bill Yi
a4d40c35a9 Merge android10-qpr3-release to aosp-master - DO NOT MERGE
Merged-In: I05e3e332007665f72a97b217a3e829441f87f811
Change-Id: I1119b2533299f722e1c8b7faa369925168024d25
2020-07-07 06:27:51 +00:00
Treehugger Robot
3f2e4cc4e6 Merge "add build.prop for other partitions to the dist out" 2020-07-06 23:24:49 +00:00
Kelvin Zhang
46a6ab8c05 Merge "Check for duplicate entries in build.prop in validation script" 2020-07-06 21:13:01 +00:00
Kelvin Zhang
f2e846fb91 Check for duplicate entries in build.prop in validation script
Test: Added Unit test
Bug: 143013566
Change-Id: Ida14507a4a6034990bc81d5263ef1cea34f589c1
2020-07-06 15:13:11 -04:00
Treehugger Robot
19950004b5 Merge "target-host-required: Be permissive when ALLOW_MISSING_DEPENDENCY is set" 2020-07-06 09:52:22 +00:00
Yo Chiang
d23ac0e477 target-host-required: Be permissive when ALLOW_MISSING_DEPENDENCY is set
add-all-host-to-target-required-modules-deps and
add-all-target-to-host-required-modules-deps permit errors when
ALLOW_MISSING_DEPENDENCY is set to true.

The previous behavior may break when doing unbundled builds.

Bug: 160318430
Bug: 7456955
Test: TH art-target-arm build pass
Change-Id: I00818d27ce18f4072eff9fa98958be820b5cd1f8
Merged-In: I00818d27ce18f4072eff9fa98958be820b5cd1f8
(cherry picked from commit 2c7c8bb657)
2020-07-06 10:57:51 +08:00
Jiyong Park
0ee7115b2d add build.prop for other partitions to the dist out
Previously, only system/build.prop was registered as dist out. This
change adds build.prop in the other partitions to the dist out. This
will allow us to examine those build.prop files without downloading
the entire target-files.zip file.

Bug: 117892318
Test: examine the dist out
Change-Id: I6f4ba16d765336a57f0da90edba788a627f25e60
2020-07-03 09:59:10 +09:00
Ulyana Trafimovich
4637537110 Merge "Remove mentions of deleted script construct_context.sh in comments." 2020-07-02 09:06:27 +00:00
Treehugger Robot
0ee038dffa Merge "Dedup lists of NDK libraries from Soong." 2020-07-02 02:12:26 +00:00
Treehugger Robot
13bf168b68 Merge "rbe: Remove stray /" 2020-07-01 23:13:05 +00:00
Treehugger Robot
fd75d8deca Merge "Add LOCAL_APKCERTS_FILE support." 2020-07-01 19:53:32 +00:00
Jaewoong Jung
704b454ca1 Add LOCAL_APKCERTS_FILE support.
This is used when Soong and Make don't know the full output file list,
and so use a tool to generate a per-module apkcerts.txt file instead.

Fixes: 160119159
Test: m apkcerts-list
Merged-In: I48183bc8cbf9dcc521f791812734205ed3f28f4c
Change-Id: I48183bc8cbf9dcc521f791812734205ed3f28f4c
2020-07-01 10:01:16 -07:00
Treehugger Robot
dada4c090a Merge "Rename the Default* constants in java/config." 2020-07-01 14:43:46 +00:00
Pete Gillin
3829475b74 Rename the Default* constants in java/config.
These values are used in two out of the many possible sdk_version
configurations, and therefore weren't really defaults in any
meaningful sense. Giving them more descriptive names makes the code
easier to follow.

Bug: 157640067
Test: m java
Change-Id: I67767b2be72ed3d8cc879280036850096eb65415
2020-07-01 12:47:02 +01:00
Treehugger Robot
92346502ba Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." 2020-07-01 08:39:42 +00:00
Jiyong Park
c0bd8c7611 Move build.prop to ./etc subdir for some partitions
build.prop files under system_ext, product, and odm partitions are moved
to the ./etc subdirectory. This is to be in-line with the established
practice of having all configuration files under ./etc subdir.
build.prop doesn't need to be an exception.

However, system/build.prop and vendor/build.prop were not moved because
there are a lot of apps and tools that depend on the path.

Bug: 158735147
Test: device has build.prop under ./etc and is bootable
Change-Id: I37c79f7337680f92406d9e196e5762bb8e7da5d8
2020-07-01 13:08:40 +09:00
Jiyong Park
dd3af422a2 Merge changes from topic "sysprop"
* changes:
  Handle the case when non-optional props have the same value
  BUILD_BROKEN_DUP_SYSPROP as escape hatch for the new sysprop restriction
  pm.dexopt.* props in runtime_libart.mk becomes optional
  Some properties are set as optional
  ro.zygote in base_system.mk is optional
  Don't inherit tablet-dalvik-heap for GSI and emulator
  Support optional prop assignments
2020-07-01 01:46:47 +00:00