Commit Graph

21590 Commits

Author SHA1 Message Date
Inseob Kim
10e02dcd43 Generate VNDK snapshot with Soong except configs
This is the first commit to generate VNDK snapshot with Soong: .so
files, some txt files, and notice files are captured with Soong. As
ld.config.txt is currently in Android.mk and will be deprecated soon,
configs files (and zipping all of artifacts) are still handled with
Makefile.

Bug: 131564934
Test: 1) DIST_DIR=out/dist development/vndk/snapshot/build.sh
Test: 2) try installing vndk snapshot with:
         development/vndk/snapshot/update.py

Change-Id: Ia904e8a1b44824d6c9556ada93bf1616620a1363
2019-05-14 06:40:08 +00:00
android-build-team Robot
4050778e6c Make change and version bump to PQ3A.190701.002
Change-Id: I94cf0c65e7f07f81f5ffde2d995cf5cf0a555745
2019-05-14 05:00:34 +00:00
Paul Scovanner
9367a27584 Update Security String to 2019-07-01
Bug:132634503
(cherry picked from commit 95bee0f53e)

Change-Id: I56f52497c7aeb4a7fbff0058218e861d2d552b62
2019-05-14 04:56:36 +00:00
android-build-team Robot
eb35544120 Make change and version bump to QP1A.190514.001
Change-Id: I274193cbaccbd33169c49b5c04bf344529b5d926
2019-05-14 03:17:27 +00:00
Paul Scovanner
0718f458a1 Update Security String to 2019-07-05
Bug:132634503
2019-05-14 00:02:43 +00:00
Xin Li
0590d456e0 DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
Bug: 132622481
Change-Id: Ide25ddcfa9a928b3affff72c2ce20e77865bd7d5
2019-05-13 15:57:57 -07:00
Paul Scovanner
95bee0f53e Update Security String to 2019-07-01
Bug:132634503
2019-05-13 20:36:29 +00:00
Anton Hansson
879b007555 Make PRODUCT_CHARACTERISTICS a single-valued variable
Values should be comma-separated, and things won't go down well
if there are multiple words in this variable.

Bug: 123783710
Test: Put this in product_config.mk and ran multiproduct_kati:
      ifneq (1,$(words $(PRODUCT_CHARACTERISTICS)))
        $(error oops)
      endif
Change-Id: I5627f416093d68d8d19916a914739686b74d392f
2019-05-13 18:15:32 +01:00
Pete Gillin
286127c342 Merge "Whitelist javax.annotation.processing for inclusion in core-oj." am: 738b9963d5
am: 0077fa356e

Change-Id: If0c9c500710fea0c739d627c7d16f0c4d3493dcd
2019-05-13 05:07:36 -07:00
Pete Gillin
738b9963d5 Merge "Whitelist javax.annotation.processing for inclusion in core-oj." 2019-05-13 11:37:43 +00:00
Anton Hansson
6d25fc6657 Make implicit 32-bit apps on 64-bit target an error
This has been a warning for a long time. Make it an error instead.

Once this has been verified to not cause any problems, it can
likely be changed to instead default to setting
TARGET_SUPPORTS_64_BIT_APPS := true.

Test: build_test
Change-Id: I0d03fed2085009c64880a594d5a3aadf72187e60
2019-05-13 11:13:20 +01:00
android-build-team Robot
efcfd909bb Version bump to PQ3B.190605.006 [core/build_id.mk]
Change-Id: I68a7fba06083a62bb2400b9f000375e63d5c7b50
2019-05-13 03:44:58 +00:00
android-build-team Robot
1059bf1354 Make change and version bump to QP1A.190513.001
Change-Id: Ic5c14709671718aae23779b0477632e1dc04f2d4
2019-05-12 23:19:01 +00:00
Ian Pedowitz
cff10cf1ce Removing QP1A entries for qt-dev-plus-aosp
They are no longer needed now that Q is Finalized.

This should only be submitted once http://ag/q/topic:Q-Finalization
automerges to the branch

Bug: 129943426
Test: Build
Change-Id: I9cc4119d3450d2f67048899b6baeec12ce9e7ef5
2019-05-12 15:57:44 -07:00
android-build-team Robot
ab89654a1f Make change and version bump to QP1A.190512.001
Change-Id: Ia9c366ed1920aba62675d517e44a61c2dc5d465e
2019-05-11 23:21:27 +00:00
Ian Pedowitz
bed3e5262e Revert "Revert "Updating the platform sdk version for Q""
This reverts commit 842119ab3a.

Reason for revert: Rolling forward for Q-Finalization

Bug: 129975435
Bug: 129943426
Test: Build
Change-Id: I651e3ec68a765d3867be5341751cd536ccbe604a
2019-05-11 10:01:39 -07:00
Ian Pedowitz
883ad4c8b2 Android Q is now REL
Bug: 129943426
Test: Build
Change-Id: I99d58a4afeaf38c51a93cc95d9ea1f5666797602
Merged-In: I352e02484fa73ee924c84846913b93f7713c77ef
2019-05-11 08:33:31 -07:00
Colin Cross
5c70ea3844 Merge "Use a copy of dexpreopt.config" am: 976dd58b34
am: fd7da36c8e

Change-Id: I68092fff3d5f8e5610c10ce799ad9bf23b3b0490
2019-05-10 21:27:02 -07:00
Colin Cross
976dd58b34 Merge "Use a copy of dexpreopt.config" 2019-05-11 04:11:58 +00:00
android-build-team Robot
02169b55af Version bump to PQ3A.190605.004 [core/build_id.mk]
Change-Id: Ieb76c6a5e9561c3555877724ed204e32b7d886d1
2019-05-10 21:53:25 +00:00
android-build-team Robot
c19f3063b0 Version bump to QP1A.190509.006 [core/build_id.mk]
Change-Id: Ibc51026abe6915393fe322ee44caeddb541b13e9
2019-05-10 19:03:05 +00:00
Martin Stjernholm
6311b83cc2 Extend library absence check to Bionic libs and all ART debug libs.
(cherry picked from commit c2e0205927)

Test: m systemimage
Test: build_test on Forrest
Bug: 132289438
Merged-In: I1a25d8d45668638b7eb0d39ded9cad3ed30db33c
Change-Id: I5b89aa33d35022fdca7f19c98f1bae51c173a876
2019-05-10 16:14:58 +00:00
Martin Stjernholm
e954e3e47d Add the library absence check as a kati stage check.
(cherry picked from commit a5181f67a7)

Test: m systemimage
Test: build_test on Forrest
Bug: 132289438
Merged-In: I7a93cc0ac4480404a3d56c75eb43ae499e8a3a05
Change-Id: I6012e16bb02d4fea1cff51b20de94560da7a8d09
2019-05-10 16:14:50 +00:00
Martin Stjernholm
4c62151f8e Add libs that have been resolved to the library absence check.
(cherry picked from commit 7a2dde8bd5)

Test: m systemimage
Test: build_test on Forrest
Bug: 132289438
Merged-In: I9e517d3c2344b39cf2743a34723572e646675677
Change-Id: Id39a947c1522cf3a226ff1a4430c57bf7d861141
2019-05-10 16:14:29 +00:00
Martin Stjernholm
4a901c6d41 Ignore vndk-* subdirectories in the library absence check.
(cherry picked from commit 8222ce45dd)

Test: m systemimage
Test: build_test on Forrest
Bug: 132289438
Merged-In: I059c9d0edb78e52838a25cef0472807847d77417
Change-Id: I57359dc9f1aa2230acd3252118aaf41f42b7a913
2019-05-10 16:14:20 +00:00
Martin Stjernholm
b4e549bfb7 Exclude lib/arm(64) from the library absence check.
(cherry picked from commit 4655206209)

Test: m systemimage
Test: build_test on Forrest
Bug: 132289438
Merged-In: I5dfb534aa2bc24a8d0a75fde31b139a6ed86e6a5
Change-Id: Ied158548f391d67f44ca31b74a3711d1cb5216fe
2019-05-10 16:13:54 +00:00
Pete Gillin
dcc5ffee13 Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9." am: aa448d138b
am: 8acb88b50c

Change-Id: Ib66dc1ebfefbfb9cd57d92e1444f84fd3e02e30f
2019-05-10 05:22:34 -07:00
Pete Gillin
0ad2ef677d Whitelist javax.annotation.processing for inclusion in core-oj.
Bug: 123891440
Test: EXPERIMENTAL_USE_OPENJDK9=true make droid

(cherry picked from commit ec99530de3)

Merged-In: I0fc7a6841f34361883785479671f4422d720ce00
Change-Id: I70dbb89ca29ec1bb47ea5a1cf27b324d354aca11
2019-05-10 13:07:02 +01:00
Pete Gillin
aa448d138b Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9." 2019-05-10 11:50:08 +00:00
Dimitry Ivanov
768a6bf16f Merge "Filter out .native_bridge static libs from NOTICE files" am: 62ae23267f
am: d85091b9eb

Change-Id: I3647089bea282929158f2f1e51e13a87dabbf86c
2019-05-10 03:39:09 -07:00
Dimitry Ivanov
62ae23267f Merge "Filter out .native_bridge static libs from NOTICE files" 2019-05-10 08:17:15 +00:00
Colin Cross
51ba1df2f0 Use a copy of dexpreopt.config
Move the dexpreopt.config passed to Soong to out/soong/dexpreopt.config
and let it write a new copy in a rule and pass the path back to make
as DEX_PREOPT_CONFIG_FOR_MAKE.

Bug: 132379813
Test: m checkbuild
Change-Id: Iac29beac3af8864d36d1563ce42bed11b685548d
2019-05-09 22:16:13 -07:00
android-build-team Robot
73f14402e7 Version bump to QP1A.190509.005 [core/build_id.mk]
Change-Id: I92b8fe3445d2a74bff06890cc4453f1182bf716a
2019-05-10 02:29:58 +00:00
android-build-team Robot
37689c52df Version bump to QP1A.190509.004 [core/build_id.mk]
Change-Id: I3918e6e009b24b882d1dcdada5499a7336becff8
2019-05-10 01:10:20 +00:00
android-build-team Robot
2f8b660e51 Version bump to QP1A.190509.003 [core/build_id.mk]
Change-Id: I4aa81b2ab2d51a9cd856d4a12f84f89775966c58
2019-05-10 00:35:19 +00:00
Xin Li
8a39705283 Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." 2019-05-09 22:05:51 +00:00
android-build-team Robot
b571b6d1f6 Version bump to QP1A.190509.002 [core/build_id.mk]
Change-Id: I90af7303dd1639367d4018b60fbefddba28fd7b5
2019-05-09 21:34:08 +00:00
Xin Li
8ba7af7849 DO NOT MERGE - Merge Pie Bonito/Sargo into master.
Bug: 131756210
Change-Id: I6381f0300194fbe153b951eb30c5228b75de90c5
2019-05-09 09:27:02 -07:00
dimitry
a19987d3c2 Filter out .native_bridge static libs from NOTICE files
LOCAL_STATIC_LIBRARIES may contain .native_bridge suffix
when built for translated targets.

This CL makes the NOTICE file exception apply for them too.

Bug: http://b/77159578
Test: make
Change-Id: Ic8a18f06afa0c460751f21587b7f751ac0ae4a3f
2019-05-09 16:35:41 +02:00
Pete Gillin
273b25f9fd Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9.
The current EXPERIMENTAL_USE_OPENJDK9 environment variable is a legacy
from when the 8 -> 9 toolchain upgrade was happening. That migration
is done and the variable only affects the language level, so it should
have a name that reflects that. (The current situation would be
especially confusing if we started a 9 -> 11 toolchain upgrade,
presumably controlled by a variable like EXPERIMENTAL_USE_OPENJDK11,
since the two settings look incompatible but are actually orthogonal.)

The current variable historically allowed a value or "1.8" which meant
"use the OpenJDK 9 toolchain but target language level 8". That value
no longer has any meaning and the new variable doesn't allow it.

Bug: 131678633
Test: `make` with `EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true`
Test: `javap -v $OUT_DIR/soong/.intermediates/libcore/core-oj/android_common/javac/classes/java/util/List.class | grep 'major version'` shows 53
Change-Id: Ic1f76a656bea30713b356a28e82f908a46933893
Test: Audit all mentions of the old string here and downstream
2019-05-09 15:30:39 +01:00
Martin Stjernholm
d0a2283d4b Merge "Extend library absence check to Bionic libs and all ART debug libs." am: f26bef86ec
am: d1ed63d2aa

Change-Id: I2ce6bebc7b0486c822cfb0e8549a2c6b1f8637d6
2019-05-09 05:12:58 -07:00
Martin Stjernholm
d1ed63d2aa Merge "Extend library absence check to Bionic libs and all ART debug libs."
am: f26bef86ec

Change-Id: Ia4fd7c2eda96b16401c88052067400e2259c6ddf
2019-05-09 05:06:47 -07:00
Martin Stjernholm
f26bef86ec Merge "Extend library absence check to Bionic libs and all ART debug libs." 2019-05-09 11:51:37 +00:00
Jiyong Park
bcbb7f734a Merge "Ensure TARGET_FLATTEN_APEX == true when ro.apex.updatable is not set"
am: 333f7b5fcc

Change-Id: I689fc63918eed509f83788482fc6b7e0cbed2ae9
2019-05-09 01:56:16 -07:00
Treehugger Robot
333f7b5fcc Merge "Ensure TARGET_FLATTEN_APEX == true when ro.apex.updatable is not set" 2019-05-09 08:48:05 +00:00
Isaac Chen
047192f550 Merge "Add PRODUCT_EXTRA_VNDK_VERSIONS product variables" am: 765e433d24
am: d81b1d0fab

Change-Id: I4c2cce06269680b15ffc7523c9d5789863326a12
2019-05-09 01:42:14 -07:00
Isaac Chen
d81b1d0fab Merge "Add PRODUCT_EXTRA_VNDK_VERSIONS product variables"
am: 765e433d24

Change-Id: I113ad50950c186068e8c6c143b45a87c16346231
2019-05-09 01:36:04 -07:00
Treehugger Robot
765e433d24 Merge "Add PRODUCT_EXTRA_VNDK_VERSIONS product variables" 2019-05-09 08:25:23 +00:00
android-build-team Robot
d8433272e2 Make change and version bump to QP1A.190509.001
Change-Id: I1915d03da32c2e1452b1b46d6d6fe2c6aadbcfbe
2019-05-09 03:18:13 +00:00
Jiyong Park
02426e6118 Ensure TARGET_FLATTEN_APEX == true when ro.apex.updatable is not set
TARGET_FLATTEN_APEX and ro.apex.updatable cannot be independently set.
For a device where updating APEXes is not supported, ro.apex.updatable
should not be set (or set to false) and TARGET_FLATTEN_APEX should be
set to true. For APEX-supporting devices, it is the opposite;
ro.apex.updatable == true and TARGET_FLATTEN_APEX is false (or not set).

To ensure this relationship, TARGET_FLATTEN_APEX is by default set to
true, and overridden to false when updatable_apex.mk is inherited.

Bug: 130623080
Test: choosecombo to Pixels 2 and later; get_build_var
TARGET_FLATTEN_APEX returns false.
choosecombo to the original Pixel and other non-Pixel targets;
get_build_var TARGET_FLATTEN_APEX returns true.
choosecombo to the cuttlefish; get_build_var TARGET_FLATTEN_APEX
returns false

Merged-In: Id73a594dd9838457e68e2793122592c11a84fc83
Change-Id: Id73a594dd9838457e68e2793122592c11a84fc83
(cherry picked from commit 18411a42f0)
2019-05-09 09:56:55 +09:00