Commit Graph

43530 Commits

Author SHA1 Message Date
Nicolas Geoffray d64980f0ce Merge "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"" am: 2bff9a7c79
am: 9bb6b435fa

Change-Id: Ib3ebb994faaa2e857cab5d0589d91aedb9c8bc6b
2018-03-08 09:10:56 +00:00
Nicolas Geoffray 9bb6b435fa Merge "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS""
am: 2bff9a7c79

Change-Id: Ib0ff912ce3bfa34cf29f2b3c219de6e228b6dc96
2018-03-08 09:05:19 +00:00
Nicolas Geoffray 2bff9a7c79 Merge "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"" 2018-03-08 08:57:44 +00:00
Justin Yun ebc012de62 Add ld.config.txt for wearables
am: c29ba5a800  -s ours

Change-Id: I4ae39a8ba84865b6a92415c59779bc5fa05a08b5
2018-03-08 02:05:01 +00:00
Simran Basi d8ef044fee Merge "build/make: Add default suite for all native tests/benchmarks" am: f74c027301
am: 4fbe95bef0

Change-Id: I44cdbee1b197401fa127f940754cc38f3705059e
2018-03-08 01:58:37 +00:00
Simran Basi 4fbe95bef0 Merge "build/make: Add default suite for all native tests/benchmarks"
am: f74c027301

Change-Id: I07e53997867a684d0f1b8c8934ddd2076722e8db
2018-03-08 01:53:58 +00:00
Jiyong Park f023aedec7 Merge "Don't allow linking to a java module with broader API surface" into pi-dev
am: 355d9b8bab

Change-Id: Id029a26942b7e1d96ad3222c3ebc0010742d24a8
2018-03-08 01:48:55 +00:00
Treehugger Robot f74c027301 Merge "build/make: Add default suite for all native tests/benchmarks" 2018-03-08 01:38:04 +00:00
Justin Yun c29ba5a800 Add ld.config.txt for wearables
When BOARD_VNDK_VERSION is set, the required VNDK libs for vendor
modules are installed in vndk directory.
The default namespace configuration cannot reach those directories
and fails to link the required libs.
By installing ld.config.txt, the namespace configurations for each
build target will be selected automatically. This does not affect
the devices that requires default namespace configurations.

Bug: 74242105
Test: lunch sdk_gwear_x86-userdebug; make -j; emulator
Change-Id: Ib1097846fcd9c123184b13b6fbcfcb9a72ca3d97
Merged-In: Ib1097846fcd9c123184b13b6fbcfcb9a72ca3d97
(cherry picked from commit 61c412ed05)
2018-03-08 01:06:01 +00:00
TreeHugger Robot 355d9b8bab Merge "Don't allow linking to a java module with broader API surface" into pi-dev 2018-03-08 00:58:59 +00:00
Mathieu Chartier bcef1e4a99 Merge "For user and userdebug generate error if DEXPREOPT is not enabled" am: afc270b066
am: 6a3744ba11  -s ours

Change-Id: I7fe4749e2af8f63eeff4fb9aac779210816fbd1e
2018-03-07 22:52:05 +00:00
Colin Cross 73a365f983 Merge changes I31ea4954,Ia02f8160,I5cfea62e,If484e9eb am: 78d5ea8e9b
am: 10b24dba79

Change-Id: I331a9835e5ed731f0424e4624a15635f2c367c7c
2018-03-07 22:45:34 +00:00
Mathieu Chartier 6a3744ba11 Merge "For user and userdebug generate error if DEXPREOPT is not enabled"
am: afc270b066

Change-Id: I0f1913673dc9732325b86ea0796295bc5967e1a1
2018-03-07 22:44:58 +00:00
Colin Cross 10b24dba79 Merge changes I31ea4954,Ia02f8160,I5cfea62e,If484e9eb
am: 78d5ea8e9b

Change-Id: Id0ba6f9c089d1c59d119ec39e1fae1e0b70ac03b
2018-03-07 22:38:05 +00:00
Mathieu Chartier afc270b066 Merge "For user and userdebug generate error if DEXPREOPT is not enabled" 2018-03-07 22:34:14 +00:00
Colin Cross 78d5ea8e9b Merge changes I31ea4954,Ia02f8160,I5cfea62e,If484e9eb
* changes:
  Remove missed PRODUCT_AAPT_FLAGS
  Allow soong java libraries to include exported resources and proguard flags
  Silence more duplicate path warnings
  Remove framework_res_package_export_deps
2018-03-07 22:25:30 +00:00
Mathieu Chartier 3bd047aef9 Merge "For user and userdebug generate error if DEXPREOPT is not enabled" into pi-dev
am: 1fb39aa1e4

Change-Id: Iff14045a3eb137d4296b0a9a61eab47f7204e20b
2018-03-07 22:24:30 +00:00
Mathieu Chartier 2594230d83 For user and userdebug generate error if DEXPREOPT is not enabled
This prevents cases where system_server is running in interpreter
only mode.

Removed unused flag in product.mk

(cherry-picked from commit 27f4287406)

Bug: 74209329
Test: WITH_DEXPREOPT=false make
Merged-In: I4ab3afed95a5baf77d0cd089dafaa18bcc1913e5
Change-Id: I4ab3afed95a5baf77d0cd089dafaa18bcc1913e5
2018-03-07 22:21:43 +00:00
Mathieu Chartier 1fb39aa1e4 Merge "For user and userdebug generate error if DEXPREOPT is not enabled" into pi-dev 2018-03-07 22:14:51 +00:00
Simran Basi d63a8153da build/make: Add default suite for all native tests/benchmarks
Not all native tests have the "tests" tag so adjust the logic to be:
NATIVE_TESTS||NATIVE_BENCHMARKS||(APPS&&tags==tests)

Bug: 74339384
Test: Rebuilt module-info.json, verified native tests now have
      their suite set to null-suite and have auto_test_config=True
      Double checked a frameworks App unittest as well.

Change-Id: Idea00adcebfc1a78b0c6d8ade40feddb1e90ed83
2018-03-07 12:36:55 -08:00
Mathieu Chartier f26b8e4249 For user and userdebug generate error if DEXPREOPT is not enabled
This prevents cases where system_server is running in interpreter
only mode.

Removed unused flag in product.mk

Bug: 74209329
Test: WITH_DEXPREOPT=false make
Change-Id: I4ab3afed95a5baf77d0cd089dafaa18bcc1913e5
2018-03-07 10:51:52 -08:00
Jiyong Park 3d71a082ed Don't allow linking to a java module with broader API surface
It has been allowed that a java module built with Android SDK or System
SDK to link against other java module built with broader API surface.
For example, an app that is building with SDK (LOCAL_SDK_VERSION :=
current or <number>) can link libs like telephony-common or bouncycastle
which are built without SDK but in fact exposing private APIs.

From now on, this is no longer allowed because it prevents the app from
being unbundled. In general, a Java module A cannot be linked to Java
module B if B is built with broader API surface than A.

Bug: 69899800
Test: m -j checkbuild on walleye, sailfish, and crosshatch
Test: m -j ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Test: ./vendor/google/build/build_test.bash --dist
Change-Id: Ibfdb1a6777f4e0606927d834d56f808639eb91f0
2018-03-07 18:36:20 +00:00
Tao Bao 51fd9428a1 releasetools: Separate streaming metadata computation into functions.
am: fe5b69a4ae

Change-Id: I78b0a4d44c8fca3a60541ec15ac02c746803c2c9
2018-03-07 18:19:06 +00:00
Colin Cross 8dad6c62d4 Remove missed PRODUCT_AAPT_FLAGS
PRODUCT_AAPT_FLAGS was removed by Iacc914114616b5bd19d9a1011802f4f9bca9bc19,
remove one more that it missed.

Test: m checkbuild
Change-Id: I31ea4954f5af5af37f13210925ed5d622625d71b
2018-03-07 09:48:33 -08:00
Colin Cross 7874138a8a Allow soong java libraries to include exported resources and proguard flags
Test: m checkbuild
Change-Id: Ia02f816084d0eb1c0e0f20e1ecd57aaf3778874c
2018-03-07 09:48:33 -08:00
Colin Cross f6799e859a Silence more duplicate path warnings
Silence warnings when merging header jars that were missed by
Ifb67dbf7734b5f53941d110f578c4fe642e36005.

Bug: 69316739
Test: m checkbuild
Change-Id: I5cfea62e46d99f9b315a589d8915bf62307220aa
2018-03-07 09:47:41 -08:00
Colin Cross 6e136922f3 Remove framework_res_package_export_deps
framework_res_package_export is now always either the prebuilt
android.jar from an SDK or a package-export.apk generated by
Soong, so the dependency on R.stamp is never useful.  Remove
all assignments to framework_res_package_export_deps, and replace
usages with frameworks_res_package_export.

Test: m checkbuild
Change-Id: If484e9eb08061cb0ed0697755f13db71d741aaab
2018-03-07 09:47:41 -08:00
Roland Levillain 209b96e152 Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"
This reverts commit 86a596c711.

Reverting as that commit breaks ART tests' results (see
b/73804944).

Test: m test-art-host
Bug: 73804944
Bug: 26275726
Change-Id: I06af4b170d845d3e55e044c28ec22d4b3ca3dede
2018-03-07 16:25:55 +00:00
Justin Yun 174dbb6991 Merge "Add ld.config.txt for wearables" am: f99efebc75
am: ccf495304e

Change-Id: I7726f8c2483485a0cd12009cb69cbef38a4ac9f9
2018-03-07 08:06:12 +00:00
Justin Yun ccf495304e Merge "Add ld.config.txt for wearables"
am: f99efebc75

Change-Id: Ib120ac820784ab4e0f96611049d3522b61aa3f03
2018-03-07 08:00:35 +00:00
Treehugger Robot f99efebc75 Merge "Add ld.config.txt for wearables" 2018-03-07 07:55:40 +00:00
Tao Bao b9ee298fc6 Merge "releasetools: Separate streaming metadata computation into functions." am: 737bc2b082
am: bfecf9b4cb

Change-Id: I47380d2479460fe9a18ff0b087a3a0a2523dc4c2
2018-03-07 04:40:32 +00:00
Tao Bao bfecf9b4cb Merge "releasetools: Separate streaming metadata computation into functions."
am: 737bc2b082

Change-Id: Idada35c528c2f4be720ebba4870f43c0329e1a65
2018-03-07 04:35:34 +00:00
Justin Yun 61c412ed05 Add ld.config.txt for wearables
When BOARD_VNDK_VERSION is set, the required VNDK libs for vendor
modules are installed in vndk directory.
The default namespace configuration cannot reach those directories
and fails to link the required libs.
By installing ld.config.txt, the namespace configurations for each
build target will be selected automatically. This does not affect
the devices that requires default namespace configurations.

Bug: 74242105
Test: lunch sdk_gwear_x86-userdebug; make -j; emulator
Change-Id: Ib1097846fcd9c123184b13b6fbcfcb9a72ca3d97
2018-03-07 13:27:24 +09:00
Tao Bao fe5b69a4ae releasetools: Separate streaming metadata computation into functions.
And add unittests for ComputeStreamingMetadata().

This prepares for the changes that add additional property-files (for
both of A/B and non-A/B).

Bug: 74210298
Bug: 72751683
Test: python -m unittest test_ota_from_target_files
Test: Generate A/B OTA package. Check the ota-streaming-property-files
      in the METADATA entry.
Change-Id: Ib4b069f61c2c06c035c0cff73a55112f3936b969
(cherry picked from commit f5110498c0)
2018-03-06 20:26:38 -08:00
Tao Bao 737bc2b082 Merge "releasetools: Separate streaming metadata computation into functions." 2018-03-07 04:24:13 +00:00
Tao Bao 33c9f2f8c7 Merge "Conditionally generate META/boot_filesystem_config.txt." am: 1ac4e3c424
am: 3b0f52befe

Change-Id: I6004353ff7c73f51e42cf0cd2bcdd865b37abf55
2018-03-06 23:56:10 +00:00
Tao Bao 3b0f52befe Merge "Conditionally generate META/boot_filesystem_config.txt."
am: 1ac4e3c424

Change-Id: Iacc05627c74029fff8fe7c2cea02fcbe80bd1d0f
2018-03-06 23:50:03 +00:00
Treehugger Robot 1ac4e3c424 Merge "Conditionally generate META/boot_filesystem_config.txt." 2018-03-06 23:32:40 +00:00
Tobias Thierer fcf943b14d Merge "Clarify error message for bootclasspath whitelist." am: 0d6a25c73f
am: 17f31a1146

Change-Id: Ic08b0bce25bc9ea802e7f4b3a7fecf02fe874f79
2018-03-06 19:27:50 +00:00
Tobias Thierer 17f31a1146 Merge "Clarify error message for bootclasspath whitelist."
am: 0d6a25c73f

Change-Id: Id7cf89f3a778ef0be44a5227fc5c14735e132096
2018-03-06 19:24:52 +00:00
Anton Hansson 25861167c8 Merge "Add more control to the java sdk enforcement." am: 53876001bf
am: 992928944e

Change-Id: I13ebe3ead2d19aa797bcc39a7bbccdb55b9c7d1c
2018-03-06 19:18:02 +00:00
Anton Hansson 992928944e Merge "Add more control to the java sdk enforcement."
am: 53876001bf

Change-Id: I489f5114b2d782c2f1fbb6809edd1d19157ca388
2018-03-06 19:11:59 +00:00
Siyamed Sinir 1a0a0d8e0a Enable Odia & Assamese localizations for L10n builds
am: 27f4287406

Change-Id: I2e9ba31ad0d12e1fbb0fcdde3260be0880404890
2018-03-06 19:10:54 +00:00
Treehugger Robot 0d6a25c73f Merge "Clarify error message for bootclasspath whitelist." 2018-03-06 18:24:11 +00:00
Anton Hansson 53876001bf Merge "Add more control to the java sdk enforcement." 2018-03-06 11:19:38 +00:00
Tao Bao f5110498c0 releasetools: Separate streaming metadata computation into functions.
And add unittests for ComputeStreamingMetadata().

This prepares for the changes that add additional property-files (for
both of A/B and non-A/B).

Bug: 74210298
Bug: 72751683
Test: python -m unittest test_ota_from_target_files
Test: Generate A/B OTA package. Check the ota-streaming-property-files
      in the METADATA entry.
Change-Id: Ib4b069f61c2c06c035c0cff73a55112f3936b969
2018-03-06 00:06:23 -08:00
Nan Zhang b661846d29 Merge "Fix the incorrect turbine flag." am: 9d08769406
am: bb68a6bfb9

Change-Id: Ic8766f09606e34d5e1db5196c02f67923682d950
2018-03-06 03:08:18 +00:00
Nan Zhang bb68a6bfb9 Merge "Fix the incorrect turbine flag."
am: 9d08769406

Change-Id: I775496ff6adc6b7fd63681703bcef9646c303f41
2018-03-06 03:03:39 +00:00
Treehugger Robot 9d08769406 Merge "Fix the incorrect turbine flag." 2018-03-06 01:22:39 +00:00