Commit Graph

37084 Commits

Author SHA1 Message Date
Ian Pedowitz 6f93dd52b2 Merge "Revert "O is API 26."" into oc-dev 2017-05-04 00:07:11 +00:00
Yifan Hong 4a352c9df0 Only checks compatibility for VINTF XMLs when PRODUCT_FULL_TREBLE
Bug: 37954458
Bug: 37321309

Test: build with lunch bullhead (PRODUCT_FULL_TREBLE=false)
Test: build with lunch marlin   (PRODUCT_FULL_TREBLE=true)
Change-Id: I2f3f8e4439e3986b9af635ac52c116f352215642
2017-05-03 16:33:23 -07:00
Ian Pedowitz 75feb8927a Revert "O is API 26."
This reverts commit 06fc7e023b.

Reason for revert:  b/37355569

Bug: 37480230
Bug: 37355569
Change-Id: I2eef4fb5369fa4e9d7a410461de63d4dd43dfc09
2017-05-03 22:00:47 +00:00
Colin Cross ba8689bda4 Make javac checkbuilds match jack
am: b16f288bee  -s ours

Change-Id: I0f00f05f62a03562737b657bf037e262b9ca4196
2017-05-03 21:54:42 +00:00
Colin Cross b16f288bee Make javac checkbuilds match jack
Building all java to dex is very slow.  Make javac checkbuilds act
like jack checkbuilds and only build to class files for unused
modules, and add a java-dex target that can be used to build
everything to dex.

Bug: 33105206
Test: m -j checkbuild
Change-Id: Idcf9c9e0223b9dd88aaa53beb0cb50a230034b0f
Merged-In: Idcf9c9e0223b9dd88aaa53beb0cb50a230034b0f
(cherry picked from commit 9eff830fa2)
2017-05-03 12:42:20 -07:00
Nicolas Geoffray bf824a69db Remove obsolete pm.dexopt properties.
bug:33799337
bug:34715556

Test: build
Change-Id: I5620d6516a7283483272e888fad31cd97491cc0f
2017-05-03 13:28:45 +01:00
Nicolas Geoffray af8dcec48d Merge "Update build files to new compiler filters." into oc-dev
am: c4b1823c79

Change-Id: Iaf9321fa9a84400b7e5b93f0a7af838e1930ccd6
2017-05-03 08:09:51 +00:00
Nicolas Geoffray 9cd7e03f95 Merge "Use 'quicken' instead of 'interpret-only'." into oc-dev
am: 64fe1d29ea

Change-Id: I8c0929a639094369c1f29aa1b73e2c9a7c3d6a88
2017-05-03 08:09:38 +00:00
Nicolas Geoffray c4b1823c79 Merge "Update build files to new compiler filters." into oc-dev 2017-05-03 08:04:34 +00:00
Nicolas Geoffray 64fe1d29ea Merge "Use 'quicken' instead of 'interpret-only'." into oc-dev 2017-05-03 08:04:34 +00:00
Colin Cross cbdc83aac6 Clear LOCAL_JACK_ENABLED for ANDROID_COMPILE_WITH_JACK=false
am: a4f65df11a  -s ours

Change-Id: I87dcba268b218123506b3f7976e94ab44d110246
2017-05-03 05:17:55 +00:00
Colin Cross 49718f9b85 Merge "Only set TARGET_PLATFORM version in lunch when explicitly requested" am: 4a3dc1458f am: 624932e360
am: 6969203720

Change-Id: I84652622424ec1abe317b847d5fe00962aeb5853
2017-05-03 04:49:16 +00:00
Colin Cross 98d2f0e65a Merge "Clear LOCAL_JACK_ENABLED for ANDROID_COMPILE_WITH_JACK=false" am: 4b7074e249 am: 23f2379b3f
am: 5b04649fc4

Change-Id: I2a3c34bc91e37a2285a7a2b311243173b147faa8
2017-05-03 04:48:56 +00:00
Colin Cross 6969203720 Merge "Only set TARGET_PLATFORM version in lunch when explicitly requested" am: 4a3dc1458f
am: 624932e360

Change-Id: I45f7279ee6a216fec15fcd2dd2337126d78bb684
2017-05-03 04:46:19 +00:00
Colin Cross 5b04649fc4 Merge "Clear LOCAL_JACK_ENABLED for ANDROID_COMPILE_WITH_JACK=false" am: 4b7074e249
am: 23f2379b3f

Change-Id: Iaf8f218a46ff225ebb9b4c9303e9d23dee786a9c
2017-05-03 04:45:55 +00:00
Colin Cross 624932e360 Merge "Only set TARGET_PLATFORM version in lunch when explicitly requested"
am: 4a3dc1458f

Change-Id: I4e91adff95d9a71b88c204783a1b1546433219c7
2017-05-03 04:43:50 +00:00
Colin Cross 23f2379b3f Merge "Clear LOCAL_JACK_ENABLED for ANDROID_COMPILE_WITH_JACK=false"
am: 4b7074e249

Change-Id: I98927879453092b5d38b96c6fd2031e4d025aa80
2017-05-03 04:43:25 +00:00
Colin Cross a4f65df11a Clear LOCAL_JACK_ENABLED for ANDROID_COMPILE_WITH_JACK=false
CL I2189055aac9deccc36b8eab8e949796dddadf7a1 moved the
ANDROID_COMPILE_WITH_JACK=false check to configure_local_jack.mk,
which broke some modules that use ifndef LOCAL_JACK_ENABLED to
change their behavior we jack is disabled.  Clear
DEFAULT_JACK_ENABLED when ANDROID_COMPILE_WITH_JACK=false so
that LOCAL_JACK_ENABLED is cleared.

Bug: 37483961
Test: m -j checkbuild
Change-Id: I0d08946c57182689624c57f4952d7cecaa0b82b3
Merged-In: I0d08946c57182689624c57f4952d7cecaa0b82b3
2017-05-03 04:37:09 +00:00
Treehugger Robot 4a3dc1458f Merge "Only set TARGET_PLATFORM version in lunch when explicitly requested" 2017-05-03 04:36:56 +00:00
Colin Cross 4b7074e249 Merge "Clear LOCAL_JACK_ENABLED for ANDROID_COMPILE_WITH_JACK=false" 2017-05-03 04:36:28 +00:00
Colin Cross 151cd4c75c Merge "Sort inputs to compatibility suite zip files" am: 328290459d am: a2b1052ae2
am: ba89e33a6c

Change-Id: I9831de58c41545dc1e0e40edadd96a83df3b70a1
2017-05-03 02:52:18 +00:00
Colin Cross ba89e33a6c Merge "Sort inputs to compatibility suite zip files" am: 328290459d
am: a2b1052ae2

Change-Id: I89612f53a26d5f5f7ed08ffe8820080ae73810e7
2017-05-03 02:50:17 +00:00
Colin Cross 1c1e142199 Only set TARGET_PLATFORM version in lunch when explicitly requested
Setting TARGET_PLATFORM_VERSION to DEFAULT_PLATFORM_VERSION during
"lunch sailfish-userdebug" causes unnecessary pain when
DEFAULT_PLATFORM_VERSION becomes invalid after branching.  Only
set TARGET_PLATFORM_VERSION if it was explicitly requested with
lunch sailfish-userdebug-OPR1.

Test: build/make/tests/envsetup_tests.sh
Bug: 34972208
Bug: 37208937
Change-Id: I40ba4617e73803c5bec1a8d317382f70fb3ec3a2
Merged-In: I40ba4617e73803c5bec1a8d317382f70fb3ec3a2
2017-05-03 02:47:59 +00:00
Colin Cross a2b1052ae2 Merge "Sort inputs to compatibility suite zip files"
am: 328290459d

Change-Id: Idf090f0f7cd7c7d88621dbb26a21b9ef44621e94
2017-05-03 02:47:45 +00:00
Treehugger Robot 328290459d Merge "Sort inputs to compatibility suite zip files" 2017-05-03 02:43:33 +00:00
Colin Cross f899251e12 Clear LOCAL_JACK_ENABLED for ANDROID_COMPILE_WITH_JACK=false
CL I2189055aac9deccc36b8eab8e949796dddadf7a1 moved the
ANDROID_COMPILE_WITH_JACK=false check to configure_local_jack.mk,
which broke some modules that use ifndef LOCAL_JACK_ENABLED to
change their behavior we jack is disabled.  Clear
DEFAULT_JACK_ENABLED when ANDROID_COMPILE_WITH_JACK=false so
that LOCAL_JACK_ENABLED is cleared.

Bug: 37483961
Test: m -j checkbuild
Change-Id: I0d08946c57182689624c57f4952d7cecaa0b82b3
2017-05-02 18:58:29 -07:00
Dan Willemsen 2e68205f3e Merge "Exempt UBSAN runtime library from soong_to_convert" am: 94751070e8 am: 0d694416d2
am: 97018accea

Change-Id: I7d14fcfbf6b42611cdce83517328f50ad157885a
2017-05-03 01:28:40 +00:00
Dan Willemsen 97018accea Merge "Exempt UBSAN runtime library from soong_to_convert" am: 94751070e8
am: 0d694416d2

Change-Id: I948e0bc53a812ba64624d07e992ef1f727a19452
2017-05-03 01:26:10 +00:00
Dan Willemsen 0d694416d2 Merge "Exempt UBSAN runtime library from soong_to_convert"
am: 94751070e8

Change-Id: Ib66aa922b885d8d6e0bd99836ddd684b14e214a3
2017-05-03 01:24:11 +00:00
Treehugger Robot 94751070e8 Merge "Exempt UBSAN runtime library from soong_to_convert" 2017-05-03 01:18:58 +00:00
Colin Cross 30c33b1c2b Sort inputs to compatibility suite zip files
Sort the inputs to remove duplicates, which fixes:
found two file paths to be copied into dest path: "target/testcases/minikin_perftests/minikin_perftests", both ["target/testcases/minikin_perftests/minikin_perftests"]"out/target/product/bullhead/testcases/minikin_perftests/minikin_perftests" and ["target/testcases/minikin_perftests/minikin_perftests"]"out/target/product/bullhead/testcases/minikin_perftests/minikin_perftests"!

Test: m -j device-tests
Change-Id: I8d7e83cd077c62461c9a08e7f1b49c321fbcb0e3
2017-05-02 17:56:57 -07:00
Colin Cross 317403a60d Merge "Support LOCAL_JACK_ENABLED := javac_frontend" into oc-dev
am: ecfd048a8e  -s ours

Change-Id: Ie921d35e5dbaf3a3a49b6cfbc8763995ed7b8c2a
2017-05-03 00:12:47 +00:00
TreeHugger Robot ecfd048a8e Merge "Support LOCAL_JACK_ENABLED := javac_frontend" into oc-dev 2017-05-03 00:03:36 +00:00
Tao Bao 160da45f74 Merge "Add the missing dependency on payload generation script." am: 3465f2ad56 am: 1f632e7a5e
am: 4752d3cbf5

Change-Id: I6dd3d6b3d4679dfde950e105ad5049444d9928a0
2017-05-02 23:57:05 +00:00
Tao Bao 4752d3cbf5 Merge "Add the missing dependency on payload generation script." am: 3465f2ad56
am: 1f632e7a5e

Change-Id: I6fc7dc2b854f48e90db01ae0b08dca988e9799ce
2017-05-02 23:54:02 +00:00
Tao Bao 1f632e7a5e Merge "Add the missing dependency on payload generation script."
am: 3465f2ad56

Change-Id: If1bfc97b7d9d0494ee46b57a086ae0ac89b932aa
2017-05-02 23:51:34 +00:00
Tao Bao 3465f2ad56 Merge "Add the missing dependency on payload generation script." 2017-05-02 23:42:44 +00:00
Colin Cross 5730186686 Merge "Make javac checkbuilds match jack" am: cb8077df16 am: 9f1e58aab9
am: 2e2758b69d

Change-Id: I7d62da41492c2a4aae39d5f29b9b6086be9f58e6
2017-05-02 23:10:30 +00:00
Colin Cross 2e2758b69d Merge "Make javac checkbuilds match jack" am: cb8077df16
am: 9f1e58aab9

Change-Id: I0d79687fe8ee64450bfe2c94437aff7dfc1c407f
2017-05-02 23:08:05 +00:00
Colin Cross 9f1e58aab9 Merge "Make javac checkbuilds match jack"
am: cb8077df16

Change-Id: I0d4e5a51cab1de990abd915ae0d0a3599d84fd04
2017-05-02 23:05:30 +00:00
Treehugger Robot cb8077df16 Merge "Make javac checkbuilds match jack" 2017-05-02 22:56:38 +00:00
Michael Wright 81cd9227f3 O is API 26.
am: 06fc7e023b

Change-Id: I941174825498f5e0f517b6aa3634231a5af4c8ec
2017-05-02 22:17:32 +00:00
Colin Cross 1d49889ffd Merge "Pass TARGET_USES_HWC2 to soong as device_uses_hwc2" am: c59d10fd1a am: 83c6e74151
am: 47d8afb0f0

Change-Id: I7821cf54464c4e8f976903cee682fe6ae9b99762
2017-05-02 20:13:27 +00:00
Colin Cross 37210994ff Support LOCAL_JACK_ENABLED := javac_frontend
Allow working around Jack bugs by using javac to compile *.java
to class files, and then pass through Jack for desugaring,
proguarding, and dexing.

Also make ANDROID_COMPILE_WITH_JACK=false override LOCAL_JACK_ENABLED.

Bug: 37483961
Test: m -j checkbuild
Test: Add LOCAL_JACK_ENABLED := javac_frontend to a target
Change-Id: I2189055aac9deccc36b8eab8e949796dddadf7a1
Merged-In: I2189055aac9deccc36b8eab8e949796dddadf7a1
(cherry picked from commit b17f285169)
2017-05-02 13:11:35 -07:00
Colin Cross 47d8afb0f0 Merge "Pass TARGET_USES_HWC2 to soong as device_uses_hwc2" am: c59d10fd1a
am: 83c6e74151

Change-Id: I0ee38894fe99ca76631668efa090ced783b82a71
2017-05-02 20:10:50 +00:00
Colin Cross 83c6e74151 Merge "Pass TARGET_USES_HWC2 to soong as device_uses_hwc2"
am: c59d10fd1a

Change-Id: I8a19c8e4e522467684c9344e6af0bb12a90c6a98
2017-05-02 20:07:20 +00:00
Treehugger Robot c59d10fd1a Merge "Pass TARGET_USES_HWC2 to soong as device_uses_hwc2" 2017-05-02 19:59:42 +00:00
Yang Ni c14caeaf7a Merge "Do not package res unless RS target API < 21" am: 9aff695ab8 am: 1d42ae066f
am: 361e4a110a  -s ours

Change-Id: Icc7eb3d5c8244b7f5c0c5e38f5e0a98a241bf192
2017-05-02 19:40:46 +00:00
Yang Ni 361e4a110a Merge "Do not package res unless RS target API < 21" am: 9aff695ab8
am: 1d42ae066f

Change-Id: I7d17b97041a4598e8ef8cbd006a15eb5eaae54ca
2017-05-02 19:36:17 +00:00
Yang Ni 1d42ae066f Merge "Do not package res unless RS target API < 21"
am: 9aff695ab8

Change-Id: I98abda6234ed37e6b8a8938f8c3399740a1ee1ed
2017-05-02 19:34:19 +00:00