Commit Graph

37006 Commits

Author SHA1 Message Date
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 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
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
Yang Ni 9aff695ab8 Merge "Do not package res unless RS target API < 21" 2017-05-02 19:29:33 +00:00
Colin Cross ea60db9a83 Pass TARGET_USES_HWC2 to soong as device_uses_hwc2
TARGET_USES_HWC2 is going away, but propagate it to soong for now
to unblock converting dependency chains that end in libhwui.

Test: soong tests
Change-Id: Ie436548a60a08a487b1d85ff55706b824b297833
2017-05-02 11:18:40 -07:00
Colin Cross 761d673df4 Merge "Support LOCAL_JACK_ENABLED := javac_frontend" am: 64ed2f2478 am: d6a3273faa
am: eb2457b89e

Change-Id: I98104d161dcc709a764cb86750d3217538863fdb
2017-05-02 18:15:12 +00:00
Colin Cross eb2457b89e Merge "Support LOCAL_JACK_ENABLED := javac_frontend" am: 64ed2f2478
am: d6a3273faa

Change-Id: I8b902ff0ec388e86dd347b5aa0017b100580c618
2017-05-02 18:12:40 +00:00
Colin Cross d6a3273faa Merge "Support LOCAL_JACK_ENABLED := javac_frontend"
am: 64ed2f2478

Change-Id: I0cf84e3f17b01b348eb6b0a1aa8fb453b07fd799
2017-05-02 18:10:10 +00:00
Colin Cross 64ed2f2478 Merge "Support LOCAL_JACK_ENABLED := javac_frontend" 2017-05-02 18:05:36 +00:00
Michael Wright 06fc7e023b O is API 26.
Bug: 37480230
Test: Build, run.
Change-Id: I2f0e7fecf38d224c20d18cff856c45a7a3e624ad
2017-05-02 18:31:53 +01:00
Steven Moreland 9a1ba2e8b1 Merge "Allow PRODUCT_FULL_TREBLE_OVERRIDE to be false." am: 0f56f197fa am: 05e43e6005
am: 28a13d0d9e

Change-Id: I72ed2d7ebbd7077d2377b4f0aa44ee8b0203cf56
2017-05-02 16:57:06 +00:00
Steven Moreland 28a13d0d9e Merge "Allow PRODUCT_FULL_TREBLE_OVERRIDE to be false." am: 0f56f197fa
am: 05e43e6005

Change-Id: I4976f161116cd3b890971a3e0c9efd2f08065e60
2017-05-02 16:55:05 +00:00
Steven Moreland 05e43e6005 Merge "Allow PRODUCT_FULL_TREBLE_OVERRIDE to be false."
am: 0f56f197fa

Change-Id: Ib62676222012092e2de1736d1004ae68647ead9f
2017-05-02 16:52:34 +00:00
Treehugger Robot 0f56f197fa Merge "Allow PRODUCT_FULL_TREBLE_OVERRIDE to be false." 2017-05-02 16:45:36 +00:00
Yang Ni dfffda92e0 Merge "Do not package res unless RS target API < 21" into oc-dev
am: 671fc06b02

Change-Id: I06bd5247095b5960610eee2d44a82cab83198067
2017-05-02 16:26:35 +00:00
Yang Ni 671fc06b02 Merge "Do not package res unless RS target API < 21" into oc-dev 2017-05-02 16:11:40 +00:00
Nicolas Geoffray 7db948f787 Merge "Use 'quicken' instead of 'interpret-only'." am: c30a14020d am: efccb14386
am: 796248606e

Change-Id: I9c340846b44eed66d69a23d1dfac498c940901a8
2017-05-02 10:50:09 +00:00
Nicolas Geoffray 796248606e Merge "Use 'quicken' instead of 'interpret-only'." am: c30a14020d
am: efccb14386

Change-Id: Ic9ce814a86dc178fa8e4e7b9be12b9424fdd22b8
2017-05-02 10:48:09 +00:00
Nicolas Geoffray efccb14386 Merge "Use 'quicken' instead of 'interpret-only'."
am: c30a14020d

Change-Id: I8ac8965601c1488bf6c044d6f3eb0c1c06b90197
2017-05-02 10:45:40 +00:00
Treehugger Robot c30a14020d Merge "Use 'quicken' instead of 'interpret-only'." 2017-05-02 10:40:56 +00:00
Yifan Hong c22e2140b4 Add compatibility check for system_manifest/compatibility_matrix.xml
am: c9ad35ce39

Change-Id: I29e4ff30ee5b5062d2c30088451a61c0abd90abd
2017-05-02 07:42:47 +00:00
Yifan Hong d9842ea1c9 Add device/fwk compatibility matrices to device.
am: b5cbe22b84

Change-Id: I739579f918fe233e153a6ef1dbce77f5863dd808
2017-05-02 07:42:41 +00:00
Yifan Hong c9ad35ce39 Add compatibility check for system_manifest/compatibility_matrix.xml
Add compatibility check against device vintf schemas
when framework schemas are built.

Test: build with lunch marlin (that has manifest.xml)
Test: build with mini_emulator_arm64 (that doesn't have manfiest.xml)

Bug: 37321309

Change-Id: I87db152754d0185938bcef0c4395f477b8fd269b
2017-05-01 22:29:16 -07:00
Yifan Hong b5cbe22b84 Add device/fwk compatibility matrices to device.
Also renamed matrix.xml to compatibility_matrix.xml.

Test: make and ensure vendor/compatibility_matrix.xml is there.
Test: adb shell vintf (see matrices, compatible = true)

Bug: 37321309
Change-Id: I4ebbedf47a576a50a42df53b72e507ed31ef2e56
2017-05-01 21:49:18 -07:00
Yang Ni 6b68da0625 Do not package res unless RS target API < 21
Bug: 37626838

Since Lollipop, RS generated bitcode is embedded as strings in
generated Java files, and no longer needed in the resources.
This CL makes packaging resources conditional on RS target API, and
not do so unless it is below 21.

Test: mm in frameworks/rs/tests/java_api/Refocus, ImageProcessing2, and
      ImageProcessing_jb
Change-Id: I79a90ed4b96cb78b22a64a35b539d9d67351f4c4
(cherry picked from commit e2c0901918)
2017-05-01 20:07:45 -07:00