Commit Graph

44502 Commits

Author SHA1 Message Date
Ian Pedowitz
ec7605680a Adding Q entries to version_defaults.mk
Removing PPR1 entries from version_defaults.mk

Bug: 77589980
Test: Build
Change-Id: Ic83304d326121326f380afca8fdf466ecc0781b0
Merged-In: I1ccbfdeddb2eecb6342253e401bba118c3652f8d
2018-05-01 15:19:35 -07:00
David Brazdil
ad610fc9fd [automerger skipped] Merge "DO NOT MERGE: Create filename constant for @removed API signature file" into pi-dev
am: 700077506e  -s ours

Change-Id: I6e09c767cde9e4fb9b1d96aca114d3677b37b68d
2018-05-01 05:41:59 -07:00
David Brazdil
700077506e Merge "DO NOT MERGE: Create filename constant for @removed API signature file" into pi-dev 2018-05-01 12:31:35 +00:00
Ian Pedowitz
2f33436f15 Revert "DO NOT MERGE: P is now REL"
This reverts commit 2325d05510.

Reason for revert: Broke -plus-aosp builds.  Reverting there to fix.

Change-Id: I625092da1df78ac76590ab27b01ed6f506e5e237
2018-05-01 02:46:16 +00:00
Android Build Merger (Role)
f30193edd4 Merge "Merge "DO NOT MERGE: P is now REL" into pi-dev am: 9ab9fe762d" into pi-dev-plus-aosp 2018-05-01 02:01:21 +00:00
android-build-prod (mdb)
e846917ac9 Merge "Allow Soong to export multiple proguard flags files" am: 36bf0df48f
am: 43b310f301

Change-Id: Ice3d36f48b677cfddea265919ca9aed9e42d316d
2018-04-30 18:22:47 -07:00
Ian Pedowitz
6f1bf853cd Merge "DO NOT MERGE: P is now REL" into pi-dev
am: 9ab9fe762d

Change-Id: I89f09feebd92c79df725d2816d4831dd7af75457
2018-04-30 18:21:39 -07:00
android-build-prod (mdb)
f503b22f29 Merge changes from topic "java_sdk_library" am: e8c3dfd945
am: 8303590165

Change-Id: I6ee23bf7c8e8d0a8fb6d0264cb79900071c1ae7d
2018-04-30 18:21:37 -07:00
android-build-prod (mdb)
43b310f301 Merge "Allow Soong to export multiple proguard flags files"
am: 36bf0df48f

Change-Id: If220f5ff46aec61971e40e3097b5a6d2d1a9bc0d
2018-04-30 18:18:42 -07:00
android-build-prod (mdb)
8303590165 Merge changes from topic "java_sdk_library"
am: e8c3dfd945

Change-Id: I6eca5f3903e0743df185d15320ef74a0e222cd3f
2018-04-30 18:17:25 -07:00
Ian Pedowitz
9ab9fe762d Merge "DO NOT MERGE: P is now REL" into pi-dev 2018-05-01 01:07:50 +00:00
android-build-prod (mdb)
36bf0df48f Merge "Allow Soong to export multiple proguard flags files" 2018-05-01 01:07:24 +00:00
android-build-prod (mdb)
e8c3dfd945 Merge changes from topic "java_sdk_library"
* changes:
  sdk lib name can be in LOCAL_[STATIC_]JAVA_LIBRARIES
  java_sdk_library supports test as another API scope
  Support LOCAL_SDK_LIBRARIES for "current" builds.
2018-05-01 01:04:56 +00:00
Jiyong Park
cd06fe34e0 sdk lib name can be in LOCAL_[STATIC_]JAVA_LIBRARIES
When an sdk lib name (a module defined with java_sdk_library{...}) is
listed in LOCAL_JAVA_LIBRARIES or LOCAL_STATIC_JAVA_LIBRARIES, the name
is translated to the stubs lib name of the sdk lib.

We have to support this at least until all existing references to sdk
libs are all correctly converted to LOCAL_SDK_LIBRARIES.

Bug: 77575606
Test: m -j
Change-Id: I8cff668afd6b5f265cc7ae6fe6f5fa36b76b8334
2018-05-01 09:32:11 +09:00
Jiyong Park
6023db8844 java_sdk_library supports test as another API scope
When a module built with LOCAL_SDK_VERSION := test_current, then
it is linked against test variant of the sdk stubs library.

Bug: 77575606
Test: m -j
Change-Id: I08ce120d8e4774722a95bfc4e200ad7d123abc70
2018-05-01 09:32:01 +09:00
Colin Cross
42669e6dc7 Allow Soong to export multiple proguard flags files
Soong uses lists of proguard flags files from dependencies instead
of a single concatenated file.  Allow Soong to pass the list to
make, which will concatenate it.

Move the check inside ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
in case Soong exports an Android library with an empty
LOCAL_SOONG_EXPORT_PROGUARD_FLAGS.

Bug: 73724997
Test: m checkbuild
Change-Id: Ia8f229ec5f9fc99a23bd471dfa70c9de7316de94
2018-04-30 16:03:57 -07:00
Calin Juravle
560e2129d1 [automerger skipped] Merge changes Ieb738670,I2e2f9da1,I13c6b389 am: 12f1850261
am: ba7e18f86d  -s ours

Change-Id: I622d5e125b1eb21b677dd66947871605baad8f08
2018-04-30 15:16:49 -07:00
Anton Hansson
8ae30017e9 Support LOCAL_SDK_LIBRARIES for "current" builds.
Resolve these using the naming scheme from sdk_library.go, added
in I4a4ccf6e730e041703c63bb275d8860d0de96887.

Also re-write the LOCAL_SDK_VERSION logic, as it was becoming a
real mess.

Bug: 77575476
Test: With uiautomator in a follow-on CL
Change-Id: I11bd10c02df3d458a4ed6de90114e27fabe8d9e0
2018-04-30 23:06:57 +01:00
Calin Juravle
ba7e18f86d Merge changes Ieb738670,I2e2f9da1,I13c6b389
am: 12f1850261

Change-Id: I1973c17f0adce96e3ea2e3ab57fc816deba4bdbe
2018-04-30 15:01:54 -07:00
Calin Juravle
d4d0be5494 [automerger skipped] Merge "Remove profman --skip-apk-verification flag" into pi-dev
am: 55a53c333c  -s ours

Change-Id: Iae48387977d7912abf329e95fdfde06d6248d9e2
2018-04-30 14:45:08 -07:00
Calin Juravle
55a53c333c Merge "Remove profman --skip-apk-verification flag" into pi-dev 2018-04-30 21:36:40 +00:00
android-build-team Robot
70299e3414 Merge "Create system.prop for GSI Pi" into pi-dev
am: 5646b804de

Change-Id: Ie9f26ef4e76905d8cf77de97242a39cef22cf082
2018-04-30 14:14:55 -07:00
Calin Juravle
12f1850261 Merge changes Ieb738670,I2e2f9da1,I13c6b389
* changes:
  Pass --dex-location when processing prebuilt profiles
  Fix speed-profile compilation for prebuilds
  Update profile rules to support binary profiles
2018-04-30 21:13:33 +00:00
Calin Juravle
998608d9e8 Remove profman --skip-apk-verification flag
This happens by default now.

Test: make
Bug: 73313191

(cherry picked from commit 25ef4c018a)

Merged-In: I5cc0efb656e1b44a161420c49250640bc9d702c5
Change-Id: I5cc0efb656e1b44a161420c49250640bc9d702c5
2018-04-30 14:13:07 -07:00
android-build-team Robot
5646b804de Merge "Create system.prop for GSI Pi" into pi-dev 2018-04-30 21:03:17 +00:00
android-build-team Robot
f36ade9690 Merge "Adding VENDOR_SECURITY_PATCH to vendor partition build.prop" into pi-dev
am: d4c88f6512

Change-Id: I35b987b75f6bd7c9d07aea0c35cfb5571bddc717
2018-04-30 13:54:42 -07:00
android-build-team Robot
d4c88f6512 Merge "Adding VENDOR_SECURITY_PATCH to vendor partition build.prop" into pi-dev 2018-04-30 20:42:38 +00:00
Calin Juravle
c644651517 Pass --dex-location when processing prebuilt profiles
The apk name does not match the install location at the stage we are
processing profiles. This causes the wrong profile key to be used in the
final profile which may generate an empty app image.

Test: m; flash, dumpsys dexopt and check for speed-profile
      check that the app image is not empty
Bug: 78515726

(cherry picked from commit 60216615f4)

Merged-In: Ic5d71296583be71d96f0e7a2dd59753f1d23c350
Change-Id: Ieb7386701b631d53d452336d1ad22653e4daee42
2018-04-30 12:14:09 -07:00
Calin Juravle
62c2893849 Fix speed-profile compilation for prebuilds
We were testing the wrong variable when setting the dex2oat flags

Test: m; flash, dumpsys dexopt and check for speed-profile
Bug: 78515726

(cherry picked from commit 7d701355e9)

Merged-In: I57c0e11aab2e4879c3ba3b2851f356b5864f5da9
Change-Id: I2e2f9da1dc9ed71977ec1d698433674c731f78bc
2018-04-30 12:09:27 -07:00
Calin Juravle
8faa2ec0d8 Update profile rules to support binary profiles
Use full binary profiles instead or relying on text-based profiles. This
makes it easier to import actual profiles and do not require two rounds of
transformation.

Text based profiled probably didn't help too much anyway because if the
apps are updated the proguard names will change.

Modules are still free to define a text based profile using
LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING. This is used for frameworks jars.

Test: make
Bug: 73313191

(cherry picked from commit f99ab7580f)

Merged-In: Ifd23dde21559fbcd015020905052bc588e275356
Change-Id: I13c6b3891cbf1232f1f07d0a17f019257f7118e6
2018-04-30 12:08:51 -07:00
Calin Juravle
3f90ad5139 Merge "Remove profman --skip-apk-verification flag" am: 7d8b84717f
am: 504421db5b

Change-Id: I4c221525da66ed20bb6213846d66b7b8a595d768
2018-04-30 11:50:36 -07:00
Calin Juravle
504421db5b Merge "Remove profman --skip-apk-verification flag"
am: 7d8b84717f

Change-Id: I5ed258da4fddf64211b1e552d5764e25bbc1f876
2018-04-30 11:46:43 -07:00
Calin Juravle
7d8b84717f Merge "Remove profman --skip-apk-verification flag" 2018-04-30 18:29:20 +00:00
Tri Vo
82d1c88717 Expose selinux variables to Soong.
Bug: 33691272
Test: manual
Change-Id: I734b96be16279716208bbc0afb78b8f4555deffb
2018-04-30 11:04:24 -07:00
Anton Hansson
65b0210fd0 Merge "Update make rules to use new android.jar location." am: a22472315f
am: 636d569336

Change-Id: Ibed1095363d49ff5d8ad321392b2419594a3715c
2018-04-30 05:29:52 -07:00
Anton Hansson
636d569336 Merge "Update make rules to use new android.jar location."
am: a22472315f

Change-Id: I90f42f1def27f718c5404b3bf77e01833f2a7206
2018-04-30 05:25:41 -07:00
Anton Hansson
a22472315f Merge "Update make rules to use new android.jar location." 2018-04-30 12:15:37 +00:00
Calin Juravle
25ef4c018a Remove profman --skip-apk-verification flag
This happens by default now.

Test: make
Bug: 73313191
Change-Id: I5cc0efb656e1b44a161420c49250640bc9d702c5
2018-04-27 17:23:12 -07:00
android-build-prod (mdb)
87a21b5b5b Merge "Revert "Support regenerating partition table with bpttool in sign_target_files_apks"" am: f45bf2d59f
am: 401da96dae

Change-Id: Ibeb9a7bda48533bda5e5c762747bdf14bc791246
2018-04-27 13:59:11 -07:00
android-build-prod (mdb)
401da96dae Merge "Revert "Support regenerating partition table with bpttool in sign_target_files_apks""
am: f45bf2d59f

Change-Id: I625c3f9269fc7fe06056ff4476238b1705f4a083
2018-04-27 13:49:07 -07:00
android-build-prod (mdb)
f45bf2d59f Merge "Revert "Support regenerating partition table with bpttool in sign_target_files_apks"" 2018-04-27 20:38:57 +00:00
Calin Juravle
5cc0bc50ff Merge "Pass --dex-location when processing prebuilt profiles" into pi-dev
am: 7f6c1de799

Change-Id: Ib99b28499d75900d5bc0ccee40ee3ed9c0126dd6
2018-04-27 13:01:02 -07:00
Calin Juravle
7f6c1de799 Merge "Pass --dex-location when processing prebuilt profiles" into pi-dev 2018-04-27 19:45:20 +00:00
Bryan Henry
7febcdf75f Revert "Support regenerating partition table with bpttool in sign_target_files_apks"
This reverts commit 2a40cc6996.

Reason for revert: Broke a bunch of builds, platform/system/tools/bpt must be missing from more manifests.

Change-Id: I4c367a1fec5c62c247544227e9d3b596227e31da
2018-04-27 19:02:51 +00:00
Bryan Henry
7db558c229 Merge changes from topic "sign_target_files_iot-aosp" am: dde5f11e6a
am: f5c481aee9

Change-Id: I036c3f5ca1dd6f6d6900e507de3c5c79656bd1c3
2018-04-27 11:18:00 -07:00
Bryan Henry
f5c481aee9 Merge changes from topic "sign_target_files_iot-aosp"
am: dde5f11e6a

Change-Id: Ic4aaf81bf713080d89449b1676266365ab8cef13
2018-04-27 11:13:36 -07:00
Bryan Henry
dde5f11e6a Merge changes from topic "sign_target_files_iot-aosp"
* changes:
  Write combined bpt definition directly into META/partition-table.bpt
  Support regenerating partition table with bpttool in sign_target_files_apks
  Don't suppress stderr for 'avbtool make_vbmeta_image'
  Include default Android Things AVB keys in otatools.zip
2018-04-27 18:01:09 +00:00
Anton Hansson
66d47b884e Update make rules to use new android.jar location.
This file has been copied into a 'public' subdir. Use that, so that
the old file can be deleted. Also introduce a new macro to avoid
duplicating this path in a bunch of places.

Bug: 77525052
Test: m checkbuild
Change-Id: Ifcf59c6fb357769b2765e417c8dd56d2ad9b97aa
2018-04-27 16:39:44 +01:00
David Brazdil
b99de41221 DO NOT MERGE: Create filename constant for @removed API signature file
CL I8fe27e8c03334f9c90204db1e69447de65a06a38 introduced a new
Doclava-generated file that contains a list of dex signatures of
@removed API. This patch adds a new Makefile variable holding the
name of that file.

Bug: 78182899
Test: make
Merged-In: I20330bd59cc8b3d0ed0fa08d3f1c2be7b8656849
Change-Id: I22474bd0a43b03441a551fbb055ee336665e499a
2018-04-27 09:02:32 +00:00
Jiyong Park
fdd8f3c8ac Removed obsolete comment on PLATFORM_SYSTEMSDK_MIN_VERSION
am: 43c6a65706

Change-Id: Ic213ff189112028e93c63fa2577711eaca044bed
2018-04-27 00:11:59 -07:00