Commit Graph

50602 Commits

Author SHA1 Message Date
patricktu ada3a8d5e8 AIDEGen: Add the java sources of host java library modules into module-info.json.
Build module-info.json without this change:
Build time: 2m50.172s
File size: 21,598,737 Bytes

Build module-info.json with this change:
Build time: 2m50.428s
File size: 21,977,565 Bytes

Bug: 133148266
Test: 1. Checkout internal branch
      2. Patch this CL
      3. m -j out/target/product/generic_x86_64/module-info.json
      4. Check the java file exists:
         "GtsBackupHostTestCases": {
	     "srcs": [...,
		      ".../BaseBackupRestoreHostSideTest.java",
		      ...]

Change-Id: I1e1b34592cb7d7abd4634d9cb1a3e276bc1dc7f1
2019-05-27 11:17:55 +00:00
Colin Cross 56199af6c2 Move verify_uses_libraries.sh out of dexpreopt
dexpreopt usually gets a dex jar instead of the final APK, which
means targetSdkVersion can't be parsed out of it.  Move the
shared library verification to a tool that operates on the final
AndroidManifest.xml instead.  verify_uses_libraries.sh is still
used to verify prebuilts where we don't have an AndroidManifest.xml
and must parse it out of the APK.

Test: m Gallery2
Bug: 132357300
Change-Id: I6ade74b6144c73aee094f5d5ff343067ca0a0e5a
2019-05-26 17:42:17 +00:00
Colin Cross 539543990e Don't add dependency on missing optional shared libraries
Filter out LOCAL_OPTIONAL_USES_LIBRARIES entries that are listed
in INTERNAL_PLATFORM_MISSING_USES_LIBRARIES before using them as
a dependency.

Bug: 132357300
Test: m Gallery2
Change-Id: I09bf331f7dc95d1aaa8e5176603bcd343dd93001
2019-05-25 22:02:36 -07:00
Tri Vo bdd494aaa6 Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 133196056
Test: m selinux_policy
Change-Id: I07166a3d2b3483507db47bdd2daa7a3ad35472ae
2019-05-25 17:35:53 -07:00
Dan Willemsen 753d1ad14e Mark more BUILD_* as obsolete
These have been warnings for a couple weeks now, with no hits.

  BUILD_AUX_EXECUTABLE
  BUILD_AUX_STATIC_LIBRARY
  BUILD_HOST_FUZZ_TEST
  BUILD_HOST_NATIVE_TEST
  BUILD_HOST_STATIC_TEST_LIBRARY
  BUILD_NATIVE_BENCHMARK
  BUILD_STATIC_TEST_LIBRARY

Fixes: 130735607
Fixes: 130735003
Fixes: 130691889
Fixes: 130723134
Fixes: 130722660
Fixes: 130734558
Fixes: 130735594
Test: check all downstream build_test logs
Change-Id: Ia13e59200af8f77a79d6a17d94913b79d8970055
2019-05-25 17:20:38 -07:00
Dan Willemsen 3a1072a839 Obsolete BUILD_BROKEN_ANDROIDMK_EXPORTS
Bug: 73959648
Test: treehugger
Change-Id: Ibecc6eb97fef6924e5d909c0393d8dfaa62c7d1d
2019-05-25 17:12:12 -07:00
Dan Willemsen e048f7eff3 Remove BUILD_BROKEN_ENG_DEBUG_TAGS
All users have been removed.

Test: treehugger
Change-Id: I2cfe720bef88cc5485e90746d85a7e0a5d068ef7
Merged-In: I2cfe720bef88cc5485e90746d85a7e0a5d068ef7
2019-05-25 22:47:35 +00:00
Jooyung Han f953eb1118 Merge "make: Add support to skip current VNDK install"
am: a0ee5dee5c

Change-Id: Ife4ac394e8fedc66bad351f9c88d10769c5e3717
2019-05-24 18:24:59 -07:00
Treehugger Robot a0ee5dee5c Merge "make: Add support to skip current VNDK install" 2019-05-25 00:16:31 +00:00
Colin Cross b2a549bb85 Add com.google.android.media.effects to missing uses-library list
com.google.android.media.effects is no longer built.

Bug: 132357300
Test: m Gallery2
Change-Id: I5eeef3ed9f4875aa3c7a9ec1003944605ebe300b
2019-05-24 14:32:58 -07:00
Daniel Mentz aef2f6f46a Merge "Install radio image as part of droidcore"
am: cb3753ad55

Change-Id: I7c743ac40207d8ec1648311af594441ac64b0484
2019-05-24 14:18:06 -07:00
Treehugger Robot cb3753ad55 Merge "Install radio image as part of droidcore" 2019-05-24 21:02:55 +00:00
Daniel Mentz bacc040da0 Install radio image as part of droidcore
Previously, the radio image was only installed as part of "make dist".

Change-Id: Id497238930b5a155d1ae30fd7fb2203377c9741d
2019-05-24 17:50:27 +00:00
Jooyung Han af14113dc9 Merge "Remove recovery.id completely"
am: 8614d0181c

Change-Id: Ic0766575ffcdb7296fd7d25ad7d62e1b2ef49d8e
2019-05-24 10:09:56 -07:00
Jooyung Han 9340a673cd make: Add support to skip current VNDK install
You can get a system.img without current VNDK libs.
This may help when you want a smaller system.img given that the image
will be used with a specific version (not current) of vendor image.

Bug: 132140714
Test: m TARGET_SKIP_CURRENT_VNDK=true && see if current VNDK is not
installed

Change-Id: Ie0815e6dd6ce2f861b6c42e637da4bb146320673
2019-05-25 02:06:08 +09:00
Treehugger Robot 8614d0181c Merge "Remove recovery.id completely" 2019-05-24 16:35:44 +00:00
Dimitry Ivanov 5eb1cfa61d Merge "Fix typo in APEX_LIBS_ABSENCE_CHECK_EXCLUDE"
am: f64b664d6c

Change-Id: I04330b4f53633f818b6c673d2a8f21139cb725cb
2019-05-24 01:41:57 -07:00
Dimitry Ivanov f64b664d6c Merge "Fix typo in APEX_LIBS_ABSENCE_CHECK_EXCLUDE" 2019-05-24 08:26:36 +00:00
Yi Kong 9f6fb694e5 Merge "Add LLVM binutils prebuilds in PATH"
am: 7147b52cae

Change-Id: I458352d3272160c49f08d6267ad9c74f9f11af1f
2019-05-23 22:06:35 -07:00
Yi Kong 7147b52cae Merge "Add LLVM binutils prebuilds in PATH" 2019-05-24 00:26:27 +00:00
Daniel Norman 07f55ba840 Merge "Adds image-specific selinux_fc props to allow different file_contexts."
am: c9fc1120c1

Change-Id: I98bd743b3cb022d4803810ad1970d657f4b4e0a3
2019-05-23 17:12:22 -07:00
Daniel Norman c9fc1120c1 Merge "Adds image-specific selinux_fc props to allow different file_contexts." 2019-05-23 23:42:13 +00:00
Daniel Norman 72c626f017 Adds image-specific selinux_fc props to allow different file_contexts.
This enables mixed builds to use the file_contexts.bin from the system
build when regenerating images that come from system target files, and
similarly for file_contexts.bin from the other build when regenerating
images from other target files.

In monolithic (non-mixed) builds all image-specific selinux_fc props
point to the same file_contexts.

Bug: 132108151
Test: Built and booted mixed build devices.
Change-Id: Id51ed6d96ea6337879f1ab21d47c93c67bc25312
2019-05-23 11:21:02 -07:00
dimitry c193ae4c04 Fix typo in APEX_LIBS_ABSENCE_CHECK_EXCLUDE
arm64 guest libraries are located in lib64/arm64

Bug: http://b/77159578
Test: lunch cf_x86_64_phone-userdebug in internal master; mm -j48 dist
Change-Id: I9f1f9426cbaed0a269126cb242e1a6df9249b167
2019-05-23 16:01:50 +02:00
Jooyung Han 72b65abd41 Remove recovery.id completely
Since aosp/887473 removed ro.expect.recovery_id,
There is no usage of "RECOVERYIMAGE_ID_FILE" which points
$(PRODUCT_OUT)/recovery.id.

Test: m && boot
Change-Id: I704af874b7e4141d2e006595242f7b681aa47f05
2019-05-23 19:48:13 +09:00
Anton Hansson b5ed0170ba Merge "Add more colors to generated product graphs"
am: 64940d5a19

Change-Id: Id71f87c9e9bcdf71f62b55ac89e6c01177baac28
2019-05-23 02:53:34 -07:00
SzuWei Lin 5500278b1f Merge "Add AOSP WallpaperPicker to GSI"
am: ed46a99e81

Change-Id: I3436a7d3fc8b21451b86062fee7f967e31f19793
2019-05-23 02:52:52 -07:00
Anton Hansson 64940d5a19 Merge "Add more colors to generated product graphs" 2019-05-23 09:44:41 +00:00
Treehugger Robot ed46a99e81 Merge "Add AOSP WallpaperPicker to GSI" 2019-05-23 09:44:35 +00:00
Bowgo Tsai 45842f3885 Merge "Moving /odm/build.prop to /odm/etc/buid.prop"
am: 41b46710e9

Change-Id: I6b7003a1b7da406a256f11f46acc58d3199ee532
2019-05-23 02:33:47 -07:00
Treehugger Robot 41b46710e9 Merge "Moving /odm/build.prop to /odm/etc/buid.prop" 2019-05-23 09:16:34 +00:00
Sasha Smundak a3d96b451f Merge "Remove unused (and currently broken) `samplecode` target."
am: 92f2cd55e3

Change-Id: I60b57b363cb90e782144428a9061c800f76e5190
2019-05-23 01:54:37 -07:00
Yi Kong dfd00b1ba1 Add LLVM binutils prebuilds in PATH
Test: lunch; manually examine $PATH
Bug: 133170927
Change-Id: Iceb0add1bfde052acf547402f8d932b87cdf0a2d
2019-05-22 23:36:53 -07:00
Treehugger Robot 92f2cd55e3 Merge "Remove unused (and currently broken) `samplecode` target." 2019-05-23 06:28:25 +00:00
Sasha Smundak 2748c61659 Remove unused (and currently broken) `samplecode` target.
Running 'm samplecode' fails with
"build/make/core/main.mk:1834: error: overriding commands for target
`out/target/common/samples/libsimplejni.so', previously defined at
build/make/core/main.mk:1834"
This proves that noone has been using 'samplecode' target at least since
the build started generating both 32- and 64-bit shared libraries by default,
because development/samples/SimpleJNI/jni/Android.mk defines libsimplejni.so
as 'sample', and the deleted code in core/main.mk causes duplicate rule in
such case.

Test: treehugger
Change-Id: I38a4c478fcb0e60793129fe2513a8cdc6d2c79fb
2019-05-22 20:01:49 -07:00
SzuWei Lin 5f23fee45f Add AOSP WallpaperPicker to GSI
The patch also update the mainline whitelist.

Bug: 133295307
Test: build gsi_arm64-userdebug and flash on a Pixel device,
Test: long press on the homescreen, WallpaperPicker is in the selection
Change-Id: I7831471cc920a24d64512341f0e4f3fef5024b30
2019-05-22 17:29:58 +08:00
Hridya Valsaraju f8a9d57439 Merge "Allow for the DTB image to be built by the Android build system."
am: 0c45b0d982

Change-Id: I0687ac47c8032d2053eb82215ed8d68865a2044f
2019-05-22 02:14:18 -07:00
Treehugger Robot 0c45b0d982 Merge "Allow for the DTB image to be built by the Android build system." 2019-05-22 07:28:24 +00:00
Bowgo Tsai 71a4d5cdd5 Moving /odm/build.prop to /odm/etc/buid.prop
In device root directory, we have the following symlinks:
  - /odm/app -> /vendor/odm/app
  - /odm/bin -> /vendor/odm/bin
  - /odm/etc -> /vendor/odm/etc
  ...

This allows the Generic System Image (GSI) to be used on both devices:
  1) Has a physical odm partition, where those symlink will be hidden
     when /odm is used as the mount point
  2) Has no physical odm partition and fallback to /vendor/odm/.

We can't just have the symlink /odm -> /vendor/odm, because the former
devices won't have /vendor/odm directory, which leads to mount failure
when the mount point /odm is resolved to /vendor/odm.

The existing /vendor/odm/build.prop won't be loaded in the latter
devices, because there is no symlink:
    - /odm/build.prop -> /vendor/odm/build.prop.

Note that init blocks reading through direct symlinks (O_NOFOLLOW) so
the above symlink won't work either. This CL moves the odm build.prop
to /odm/etc/build.prop for init to load it (symlinks in earlier
components of the path will still be followed by O_NOFOLLOW).

Bug: 132128501
Test: boot a device and checks /odm/etc/build.prop is loaded
Test: make dist with an odm.img, checks $OUT/odm/etc/build.prop is loaded
Change-Id: I6f88763db755c9ec6068bfdd9cee81c19d72e9d7
Merged-In: I6f88763db755c9ec6068bfdd9cee81c19d72e9d7
(cherry picked from commit 6c62884000)
2019-05-22 14:04:39 +08:00
Hridya Valsaraju 59eaef078d Allow for the DTB image to be built by the Android build system.
The current solution expects BOARD_PREBUILT_DTBIMAGE_DIR to
contain prebuilt DTB files that are concatenated by the build system
to create $OUT/dtb.img. In order to accommodate devices that build
the dtb image locally, make boot.img creation depend on $OUT/dtb.img
only when BOARD_PREBUILT_DTBIMAGE_DIR is undefined.

Bug: 133161451
Test: Build with BOARD_PREBUILT_DTBIMAGE_DIR undefined and verify
using unpack_bootimg.py that $OUT/dtb.img was included in boot.img.

Change-Id: Iae2c634ccdc1d83589b26d382882f75fb8565a31
2019-05-22 03:51:41 +00:00
Mitch Phillips 164b2532a6 Merge "Fix fuzzer builds."
am: 65dbf9bfb3

Change-Id: I1294eea11b4dd2276011ec65df74b48b4e508fdf
2019-05-21 17:09:05 -07:00
Mitch Phillips 65dbf9bfb3 Merge "Fix fuzzer builds." 2019-05-21 22:45:43 +00:00
Pete Gillin 7a383f586c Merge "Avoid targeting Java 9 for targets with SDK version up to 29."
am: 42fe06b3c2

Change-Id: I1683b5a9da65259b60d5a1e3c64927a3350dca4e
2019-05-21 03:34:56 -07:00
Pete Gillin 42fe06b3c2 Merge "Avoid targeting Java 9 for targets with SDK version up to 29." 2019-05-21 10:19:06 +00:00
patricktu 608cf95523 Merge "AIDEGen: Collect the srcjar path of modules into module-info.json"
am: 40b5340a94

Change-Id: I1d9378152cf9aee840013d791900990ed820424d
2019-05-20 21:09:07 -07:00
Treehugger Robot 40b5340a94 Merge "AIDEGen: Collect the srcjar path of modules into module-info.json" 2019-05-21 02:02:20 +00:00
Chris Gross 07d985d122 Merge "Add merging of apexkeys and apkcerts metadata"
am: a489a92fdc

Change-Id: I8904d59ef78b7d9795e984ea796ec288d2c1f587
2019-05-20 17:12:14 -07:00
Colin Cross 468549471a Merge "Move check-all-partition-sizes to a non-phony rule"
am: 2ee5efd824

Change-Id: Ib99995a72e3c1199797cc36c2c1094b015fd4487
2019-05-20 17:07:14 -07:00
Mitch Phillips ee8f4a0ada Fix fuzzer builds.
- Updates the fuzzer builds to use SANITIZE_TARGET='fuzzer' instead of
'coverage'.
- Removed an old dependency that made fuzzer builds without ASan
an error.
- Fixed up the build flags to allow fuzzers to be built. Previously, the
coverage flags were manually provided. As the toolchain has moved on,
these flags are no longer compatible with libFuzzer, and so I've updated
them to use the correct, compatible flags.

Bug: 121042685
Test: With all patches in the bug merged, build a fuzzer using
'SANITIZE_TARGET=fuzzer mmma <your_fuzzer>'.

Change-Id: I86e6a26d27c22b3622cf6ea8760f502f607df6f0
2019-05-20 16:58:26 -07:00
Chris Gross a489a92fdc Merge "Add merging of apexkeys and apkcerts metadata" 2019-05-20 23:36:45 +00:00