Commit Graph

22765 Commits

Author SHA1 Message Date
Jeongik Cha
bb688a9fa9 Raise an error when partition setting is wrong
When setting target out path at root(/product, /system_ext), either file
system type or prebuilt image must be set. If not, we'd rather raise an
error.

Without raising an error, the artifacts in these directory are not
included in any image.

And also, extract these logics into function, and check product, odm, system_ext
For now, exempt vendor image because of some targets with prebuilt
vendor image.
Bug: 137169253
Test: set TARGET_COPY_OUT_PRODUCT := product
          BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE :=
	  BOARD_PREBUILT_PRODUCTIMAGE :=
      and then check if it causes an error.
Test: set TARGET_COPY_OUT_PRODUCT := system/product
          BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 or
	  BOARD_PREBUILT_PRODUCTIMAGE := someimage.img
      and then check if it causes an error.

Change-Id: Ibf0f7838111075ba3649e198e5649aa7e8e29d7c
2019-12-17 22:41:56 +09:00
Automerger Merge Worker
a219cab736 Merge "Add libdl_android.so to the system partition absence check." am: 4d5458d1f0 am: 5db15db9cc
Change-Id: If437adf2de2ceab88ac20d44513c6d786eb79eee
2019-12-17 13:21:03 +00:00
Jiyong Park
439b829b42 Find the jar libraries in APEX from the correct path
JAR libraries in the ART and conscrypt APEXes are no longer built for
the platform. Therefore, the path out/target/common/<name>_intermediates
does not exist. Instead use the path
out/target/common/<libname>.<apexname>_intermediates paths for those
APEX-only jars.

Bug: 128708192
Bug: 133140750
Test: m

Change-Id: I5fb725403ac22198e5ce6d77ca97c5f3392fabfd
2019-12-17 21:16:34 +09:00
Jiyong Park
0d7bd6be90 Use apex_available property
Use apex_available property to prevent modules that are only for the ART
apex from being used outside of the APEX.

Bug: 128708192
Bug: 133140750
Bug: 129006418
Test: m
Test: m libnativeloader doesn't install anything. (because it doesn't
have "//apex_available:platform".
Test: Add "libnativeloader" to shared_libs of "libvndksupport" which is
installed to /system/lib. Then the build fails with following error:

  error: system/core/libvndksupport/Android.bp:3:1: module
  "libvndksupport" variant "android_arm_armv8-a_core_shared": depends on
  //art/libnativeloader:libnativeloader which is not visible to this
  module

Change-Id: I964d0125cfedb454a60c098bf1a1797201d5dd40
2019-12-17 21:16:20 +09:00
Automerger Merge Worker
dfbb15476f Update Security String to 2020-02-01 bug:146378789 am: 82e8e79390
Change-Id: I9cae45d8b840964d52c56ce703ea3ff2c3225a36
2019-12-17 03:14:18 +00:00
android-build-team Robot
fedf723ddb Make change and version bump to QQ2A.191217.001
Change-Id: I0dd7fd8fab87a250639f798a19445f177f5985da
2019-12-17 02:21:58 +00:00
Xin Li
f9d07beb96 Merge "Make qt-qpr1-dev-plus-aosp use AOSP.MASTER as BUILD_ID." into qt-qpr1-dev-plus-aosp 2019-12-17 01:21:44 +00:00
Lubo Hristov
82e8e79390 Update Security String to 2020-02-01 bug:146378789 2019-12-16 16:05:44 -08:00
Martin Stjernholm
42ae1c8c8f Add libdl_android.so to the system partition absence check.
Test: m
Bug: 144343305
Change-Id: Ie3a9698d4d369a68ce2baffbab448af63ead4410
2019-12-16 21:43:45 +00:00
Automerger Merge Worker
240c6bff1b Merge "build: make: use -Wl,-z,separate-code w/ -Wl,--execute-only" am: 5c3bf1b164 am: 72c15268e2
Change-Id: I3b34f3f1d1024d9ddc2105e253bee3af05bdfb5c
2019-12-16 21:22:55 +00:00
Nick Desaulniers
5c3bf1b164 Merge "build: make: use -Wl,-z,separate-code w/ -Wl,--execute-only" 2019-12-16 21:13:28 +00:00
Nick Desaulniers
9882f6f7be build: make: use -Wl,-z,separate-code w/ -Wl,--execute-only
Also, prefer
-Wl,--execute-only
rather than
-Wl,-execute-only

Bug: 139945549
Bug: 146144180
Test: m
Change-Id: I4a07978c7a84a0a7e841b9e059305b0f443d0e95
Suggested-by: Ryan Prichard <rprichard@google.com>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
2019-12-16 09:55:05 -08:00
Automerger Merge Worker
b598202b3b Merge "Verify updatable jars are in PRODUCT_BOOT_JARS" am: 68209e4519 am: 0403c44566
Change-Id: Idb2e33a16171cea6af44cd501c4f35ccdd73b81f
2019-12-16 15:29:57 +00:00
Anton Hansson
37a037e05e Verify updatable jars are in PRODUCT_BOOT_JARS
A jar should never be in just the updatable list.

Test: treehugger
Change-Id: I806eb2d00502f98aa2c40fba3fc644cfddc64ad9
2019-12-16 11:27:18 +00:00
Automerger Merge Worker
99b6d96da1 Merge "Adding missing dependencies for vbmetaimage-nodeps" am: 8e3bc2d4ce am: 07e91398d7
Change-Id: Id65bbe27e3d128e0ae593552ee384143aef26287
2019-12-16 05:14:42 +00:00
Treehugger Robot
8e3bc2d4ce Merge "Adding missing dependencies for vbmetaimage-nodeps" 2019-12-16 04:47:56 +00:00
android-build-team Robot
f3669b0c6f Make change and version bump to QQ2A.191216.001
Change-Id: Id14a1803fea8168f19c3658bc6b7c5e07eb3c9d6
2019-12-16 00:23:37 +00:00
android-build-team Robot
30f0254b87 Make change and version bump to QQ2A.191215.001
Change-Id: I881e29df087606863ead612f9db84c0b724d142f
2019-12-15 00:21:20 +00:00
Automerger Merge Worker
265572c081 Merge "Write list of copy headers" am: 6fe297fcc5 am: 3830d8ae0d
Change-Id: I97e8e66e6fd747066014296cb63b0b7758991e2e
2019-12-15 00:21:15 +00:00
Dan Willemsen
6fe297fcc5 Merge "Write list of copy headers" 2019-12-15 00:04:15 +00:00
Dan Willemsen
79a0caff35 Write list of copy headers
So that soong_ui can remove obsolete headers that have been removed.

Test: cat out/target/product/crosshatch/.copied_headers_list
Test: cat out/target/product/generic/.copied_headers_list
Change-Id: I7df8029c1f2ed630d35c357f94e5dfb668e5824f
2019-12-13 19:35:05 -08:00
Automerger Merge Worker
b25e28e3c9 Merge "Initialize common_proguard_flags for each module" am: 793147469e am: 25ed10e122
Change-Id: I91c606cf7191ddc0974b1bf1583880cc099a393e
2019-12-14 03:15:55 +00:00
Treehugger Robot
793147469e Merge "Initialize common_proguard_flags for each module" 2019-12-14 02:52:59 +00:00
android-build-team Robot
58ee75e746 Make change and version bump to QQ2A.191214.001
Change-Id: I227c487d4d3be023b533dc0e5c083eacf1d50357
2019-12-14 02:19:58 +00:00
Colin Cross
2a40672597 Initialize common_proguard_flags for each module
Id938aa35e87c9c69769a3184dfea06fd02299688 removed the initial
assignment to common_proguard_flags, which both makes it grow as
each module is parsed and also turns it into a lazily evaluated
variable.  That causes the flags passed to R8 to be the flags
computed for the current module multiplied by the number of previously
parsed modules.

Fixes: 146150575
Test: m checkbuild
Change-Id: I87c9625496f482896be6867124f2f12ff662cd57
2019-12-13 16:23:11 -08:00
Treehugger Robot
ed7d5f12e3 Merge "Make AOSP master use AOSP.MASTER as BUILD_ID." 2019-12-13 22:49:08 +00:00
Automerger Merge Worker
5feb2e79a3 Merge changes from topic "gsi-with-flattened-apexes" am: b3bff1d203 am: 66ee21cedd
Change-Id: I5a1c446abab9e0e8dec7dca027bc757f8b34d14b
2019-12-13 21:56:16 +00:00
android-build-team Robot
d70b8c7ab6 Make change and version bump to QQ2A.191213.001
Change-Id: I57decea783d6fc3cbef2bf2344ff61a36f18e9f8
2019-12-13 02:20:47 +00:00
android-build-team Robot
9d32d173a9 Make change and version bump to QQ2A.191212.001
Change-Id: I4fa1314df170c5984d7c5af5942085287f1fc4d5
2019-12-12 02:20:08 +00:00
Oliver Nguyen
f0fdf80540 Add CLANG_COVERAGE build flag to soong config.
Bug: 143977934
Test: m CLANG_COVERAGE=true
Change-Id: Ief6302a1724a9e8d5bd1a48ded4eb7d15ddf18de
2019-12-11 14:58:53 -08:00
android-build-team Robot
be71df1cb3 Version bump to QQ2A.191211.002 [core/build_id.mk]
Change-Id: I41d4ca64268a8ea201553665ad6a3de651954e17
2019-12-11 22:49:21 +00:00
Jooyung Han
9efe534ef1 Add PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
For GSI targets, this variable is set true, and Soong will install both
"flattened" and "unflattened" APEXes together in /system_ext and /system
respectively.

Bug: 137802149
Test: lunch aosp_arm64-userdebug && m
  resulting apex images under /system/apex
  and flattened apexes under /system/system_ext/apex

Change-Id: Ib72d1b9dbd59727942da39323ee7e60ac6e14882
2019-12-12 02:04:43 +09:00
android-build-team Robot
fa8e62cf79 Make change and version bump to QQ2A.191211.001
Change-Id: Icd3cc9d1bbdeafd8cce1d15082b194d654087b60
2019-12-11 02:20:43 +00:00
Xin Li
75f604f581 Make AOSP master use AOSP.MASTER as BUILD_ID.
Bug: 145935472
Change-Id: I8a5443ca59414ceccd4bd75e954793678f64e427
Merged-In: I1d718255fc30b255fc83ac79233ec440074084c4
2019-12-10 16:21:50 -08:00
Bowgo Tsai
6a4eaa57b9 Adding missing dependencies for vbmetaimage-nodeps
Bug: 143513520
Test: `make vbmetaimage-nodeps` then checks the value of
      PRIVATE_AVB_VBMETA_SIGNING_ARGS appears in ./out/verbose.log.gz

Change-Id: I2eac2b2d319a46f3c3ecb56df8c6b56925a4d596
2019-12-10 15:08:24 +08:00
Aurimas Liutikas
d68d821009 Merge "Move to using full java-lib-files from stubs." am: ac3bf4e3a9
am: 09171641a3

Change-Id: I9ccdddf26512cd211e670e9461e0be1245f9a056
2019-12-09 20:57:54 -08:00
android-build-team Robot
79d1cdc7b7 Make change and version bump to QQ2A.191210.001
Change-Id: I884ace090f3fc5acaefe2e0826c6b07b0d86baff
2019-12-10 02:20:57 +00:00
Aurimas Liutikas
743c9c3b6b Move to using full java-lib-files from stubs.
java-lib-header-files (turbine) differ from java-lib-files (actual metalava
output) in how the private constructors are showing up in these jars.

in classes.jar android/telephony/AccessNetworkConstants.class
package android.telephony;

public final class AccessNetworkConstants {
    private AccessNetworkConstants() {
        throw new RuntimeException("Stub!");
    }
}

in classes-header.jar android/telephony/AccessNetworkConstants.class
package android.telephony;

public final class AccessNetworkConstants {
}

As you can see, turbine seems to skip adding the private constructor,
which means that it becomes public.

Bug: 145933077
Test: m out/target/common/obj/api.xml
      out/target/common/obj/api.xml -> no longer has public constructor
      for AccessNetworkConstants

Change-Id: Ie1763783667b41b9892c9c47e6b362d7962caf14
2019-12-09 16:36:15 -08:00
Logan Chien
1429291d9f Enable prebuilt ELF check for all targets
This commit enables prebuilt ELF checks on ALL targets.

If this commit breaks your target, you may triage the breakage by adding
the following setting to your `BoardConfig.mk`:

    BUILD_BROKEN_PREBUILT_ELF_FILES := true

And then fix the problem with the instructions:

    https://source.android.com/devices/architecture/vndk/abi-use-check

Bug: 141176116
Bug: 145925470
Test: for t in ${ALL_TARGETS}; do lunch $t; make check-elf-files; done
Change-Id: I62e0269074afe1d685cb63d5f8953a2acf03f03e
2019-12-09 14:00:25 -08:00
Xin Li
ef88d9cd99 Make qt-qpr1-dev-plus-aosp use AOSP.MASTER as BUILD_ID.
In ag/7020561, after branching of qt-dev, the BUILD_ID was changed to
"QT" and the change was tagged as "DO NOT MERGE" to prevent it flowing
into master.  However, because the -plus-aosp branches was using the
same API level and "DO NOT MERGE" will not be respected there, it would
eventually be merged to stage-aosp-master and promoted to AOSP master.

Address this by using AOSP.MASTER which will cause a merge conflict when
the merge happens.

Bug: 145935472
Change-Id: Iaa17a2c29f1f3cf28f28761a18b0d480b0253fac
Merged-In: I5c28225d61996cb719ae384d7b0828776e84f8d5
2019-12-09 13:28:32 -08:00
android-build-team Robot
83415823a4 Make change and version bump to QQ2A.191209.001
Change-Id: I0b8dbe768027f482f256caad7c358e07e5919789
2019-12-09 00:23:29 +00:00
android-build-team Robot
1d85a5e751 Make change and version bump to QQ2A.191208.001
Change-Id: I614697690956dd8b76d68dc162ac269ea4ad4d86
2019-12-08 00:23:40 +00:00
android-build-team Robot
158966744b Make change and version bump to QQ2A.191207.001
Change-Id: Ibca82f2124d5f4428e0768b2900272de31528e68
2019-12-07 02:20:07 +00:00
Dan Willemsen
033132eff6 Merge "Improve checks for include dirs outside the source tree" am: 9e0b4ed82a
am: ef5fe838f8

Change-Id: Idc34cf2d7ff58fbd5979edb512b365f49f02f910
2019-12-06 13:56:22 -08:00
Treehugger Robot
9e0b4ed82a Merge "Improve checks for include dirs outside the source tree" 2019-12-06 21:49:25 +00:00
Ian Kasprzak
b836080120 Merge "Include all system images in -with-license.sh" am: c99726bcf0
am: 9633038e48

Change-Id: I9dc5634b91cf2a018846d4cc7c1e8d0c439641f8
2019-12-06 09:25:03 -08:00
Ian Kasprzak
c99726bcf0 Merge "Include all system images in -with-license.sh" 2019-12-06 17:10:48 +00:00
Ivan Lozano
73f7aba962 Merge "Exclude dirs from binder interface whitelisting" am: deaf3fc74a
am: a3e9114b73

Change-Id: Idda8791cb12663ab6266f3c5e2d0ddd8275c3feb
2019-12-05 18:33:23 -08:00
Ivan Lozano
deaf3fc74a Merge "Exclude dirs from binder interface whitelisting" 2019-12-06 02:25:10 +00:00
android-build-team Robot
c4bce7e0ed Make change and version bump to QQ2A.191206.001
Change-Id: Ie3535bc13c399c29a20b1a7ce5c7c138e300199f
2019-12-06 02:20:03 +00:00