Commit Graph

34323 Commits

Author SHA1 Message Date
Thierry Strudel c10b033077 Merge "core/Makefile: add AVBTOOL deps to boot.img for BOARD_AVB_ENABLE"
am: e3f07c2adb

Change-Id: I37752bb4bf34bc0126128b152e3e699f6da6d163
2017-05-04 22:37:11 +00:00
Treehugger Robot e3f07c2adb Merge "core/Makefile: add AVBTOOL deps to boot.img for BOARD_AVB_ENABLE" 2017-05-04 22:31:22 +00:00
Thierry Strudel d7bd1f216f core/Makefile: add AVBTOOL deps to boot.img for BOARD_AVB_ENABLE
Bug: 37960599
Test: 'make bootimage' works when BOARD_AVB_ENABLE is true
Change-Id: I02c2fa16c9df988fbe1e1d6cd13a62278fedea45
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2017-05-04 14:00:50 -07:00
Andreas Gampe 42ecd83de6 Merge changes Idf48f45f,Id2a72fe7,If83e1df2
am: 2be7eb9161

Change-Id: Ie5836fda3e432aacea66c1b63cb3a87fac439068
2017-05-04 04:51:01 +00:00
Treehugger Robot 2be7eb9161 Merge changes Idf48f45f,Id2a72fe7,If83e1df2
* changes:
  Build: Disable leak sanitizer for ijar
  Build: Disable leak sanitizer for llvm-rs-cc
  Build: Disable leak sanitizer for aapt
2017-05-04 04:47:04 +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
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 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 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
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 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
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 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 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
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
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
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
Colin Cross 1ddf97bafb Merge "Install sqlite3 on userdebug builds"
am: 5821266790

Change-Id: I2c4cc02676809a98f184fdb3dd1358cd448245e6
2017-05-02 02:44:39 +00:00
Treehugger Robot 5821266790 Merge "Install sqlite3 on userdebug builds" 2017-05-02 02:36:58 +00:00
Steven Moreland 3a0afa7f57 Allow PRODUCT_FULL_TREBLE_OVERRIDE to be false.
Devices which are not Android phones may want to set
PRODUCT_FULL_TREBLE_OVERRIDE (and therefore
PRODUCT_FULL_TREBLE) to false.

Test: confirm expected values when putting in expected values of:
  PRODUCT_FULL_TREBLE_OVERRIDE
  PRODUCT_SHIPPING_API_LEVEL
Fixes: 37869308

Change-Id: If5a383210ea282a3a274e5eba0d32ef6cfebafd0
2017-05-01 18:11:35 -07:00
Jaekyun Seok e81fffa866 Merge "Split vendor license notices into vendor partition"
am: 9607ace215

Change-Id: I12bd431c18dc12dbe0ce56ae1728a0272aaeba76
2017-05-01 23:15:47 +00:00
Treehugger Robot 9607ace215 Merge "Split vendor license notices into vendor partition" 2017-05-01 23:08:19 +00:00
Jaekyun Seok 9e7eab53c1 Split vendor license notices into vendor partition
Xml files will be generated instead of html files, and then Settings
will generate html file on runtime from xml files of partitions.

Test: build succeeded and tested on sailfish
Bug: 37099941
Merged-In: Id7899381a537b1947cbb6164ed2b4a98492334af
Change-Id: Id7899381a537b1947cbb6164ed2b4a98492334af
(cherry picked from commit 3b7560bf88)
2017-05-01 22:07:50 +00:00
Colin Cross 9418749c48 Install sqlite3 on userdebug builds
sqlite3 had LOCAL_MODULE_TAGS := debug, which was not passed
through when converting to soong.  We prefer PRODUCT_PACKAGES_DEBUG
instead, so add it there.

Bug: 37627999
Test: sqlite3 is in installed-files.txt
Change-Id: Idb8b3aea7b7482109aa4ed3ac0016bd84dd23f22
2017-05-01 21:39:40 +00:00
Colin Cross 9eff830fa2 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.

Test: m -j checkbuild
Change-Id: Idcf9c9e0223b9dd88aaa53beb0cb50a230034b0f
2017-04-28 13:39:16 -07:00
Colin Cross b17f285169 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
2017-04-28 13:39:12 -07:00
Andreas Gampe 48d9a5c80b Build: Disable leak sanitizer for ijar
Temporary workaround.

Bug: 37756495
Test: ASAN_OPTIONS= SANITIZE_HOST=address mm
Change-Id: Idf48f45f0c33fc57af29574c8591a532144d4623
2017-04-28 10:36:12 -07:00
Andreas Gampe 83c5c474b8 Build: Disable leak sanitizer for llvm-rs-cc
Temporary workaround. Disable leak detection and container
overflow.

Bug: 37755219
Test: ASAN_OPTIONS= SANITIZE_HOST=address m
Change-Id: Id2a72fe7170123f8652f96a0fed29d03f99ae03b
2017-04-28 10:36:12 -07:00
Andreas Gampe c5bb0d736e Build: Disable leak sanitizer for aapt
Temporary workaround.

Bug: 37750224
Test: SANITIZE_HOST=address m
Change-Id: If83e1df25890717d18b841fa65635427ba2ee36a
2017-04-28 10:36:12 -07:00
Nicolas Geoffray 21715c25af Merge "Make the default preopt 'interpret-only'."
am: 078aafc590

Change-Id: Ie0451fabf2220390e0c85e8720399a6ebed06e4f
2017-04-28 12:10:01 +00:00
Nicolas Geoffray eb3d2f2e75 Use 'quicken' instead of 'interpret-only'.
bug: 34715556
Test: build
Change-Id: Id4518e80598b7baee64e92f7ff4ed600f8cdee5b
2017-04-28 13:04:38 +01:00
Nicolas Geoffray 078aafc590 Merge "Make the default preopt 'interpret-only'." 2017-04-28 12:03:18 +00:00
Nicolas Geoffray bd0518ab55 Merge "Don't preopt system server apps in system_other."
am: f53ebefae3

Change-Id: I09f7b0e690871271349073edab59250721eb88e0
2017-04-28 11:50:28 +00:00
Nicolas Geoffray 24f54693f9 Make the default preopt 'interpret-only'.
bug:33799337
bug:36534079

Test: m -j32 bullhead/angler/marlin/sailfish

(cherry picked from commit e0848c8b7f)

Change-Id: I6d71bdca1d7b7afab8150a0b19a0e2235832d5e0
2017-04-28 12:46:34 +01:00
Nicolas Geoffray f53ebefae3 Merge "Don't preopt system server apps in system_other." 2017-04-28 11:45:15 +00:00