Tao Bao
f69f143fb8
Merge "releasetools: Fix the comment for '--verify' flag." am: f9b1b4c37d
am: 4c38da5b2e
...
am: c6f0d75e57
Change-Id: I3c8a0c5dc01071bc5c63be7646fe69e1477b902b
2017-10-31 22:13:24 +00:00
Tao Bao
c6f0d75e57
Merge "releasetools: Fix the comment for '--verify' flag." am: f9b1b4c37d
...
am: 4c38da5b2e
Change-Id: I05a6cd2b85c34d22df156b9cba4c95cd7d8103ce
2017-10-31 22:09:06 +00:00
Tao Bao
4c38da5b2e
Merge "releasetools: Fix the comment for '--verify' flag."
...
am: f9b1b4c37d
Change-Id: I022bef13079404cb8079548ef568872694a504d3
2017-10-31 22:03:19 +00:00
Treehugger Robot
f9b1b4c37d
Merge "releasetools: Fix the comment for '--verify' flag."
2017-10-31 21:00:19 +00:00
Dan Willemsen
98722a30f0
Merge "Remove make version check" am: 41f54061b2
am: dc4ed6e4b5
...
am: d0ed98de63
Change-Id: Icd632bd1aa93ef959d4f7d97ee11ecaaad556c3f
2017-10-31 20:45:21 +00:00
Dan Willemsen
d0ed98de63
Merge "Remove make version check" am: 41f54061b2
...
am: dc4ed6e4b5
Change-Id: Idb26a320888a3e9ac482f3127942010fdfbcaad9
2017-10-31 20:41:18 +00:00
Dan Willemsen
dc4ed6e4b5
Merge "Remove make version check"
...
am: 41f54061b2
Change-Id: I8649e3a3e9e372b42dfaaa4fb07c80ed64a779dd
2017-10-31 20:37:12 +00:00
Treehugger Robot
41f54061b2
Merge "Remove make version check"
2017-10-31 20:31:27 +00:00
Dan Willemsen
9383a1561c
Merge "Mark some TARGET_* inputs as readonly" am: badd598c98
am: db0f20385a
...
am: edb0a0e149
Change-Id: I95f8ea2af4e5d1c1e35cd54147365a412a35dfd6
2017-10-31 19:54:47 +00:00
Dan Willemsen
edb0a0e149
Merge "Mark some TARGET_* inputs as readonly" am: badd598c98
...
am: db0f20385a
Change-Id: I83bbcc4d926e3435f7a4cbdf27d43fe7562d1dd9
2017-10-31 19:50:42 +00:00
Dan Willemsen
db0f20385a
Merge "Mark some TARGET_* inputs as readonly"
...
am: badd598c98
Change-Id: I991fc456f18e2827c962509a5db54c2c7c16da69
2017-10-31 19:48:06 +00:00
Dan Willemsen
badd598c98
Merge "Mark some TARGET_* inputs as readonly"
2017-10-31 19:43:55 +00:00
Victor Hsieh
dd58be5787
Merge "Migrate to the new apksig API" am: da343de3ba
am: 9d3b6c2ec4
...
am: 2d43232c24
Change-Id: Id142d61c8c7c1af80d65cf895232892392ee762f
2017-10-31 19:37:45 +00:00
Victor Hsieh
2d43232c24
Merge "Migrate to the new apksig API" am: da343de3ba
...
am: 9d3b6c2ec4
Change-Id: I7a52983656e26b6ba98655f249f2522380ad6768
2017-10-31 19:27:10 +00:00
Victor Hsieh
9d3b6c2ec4
Merge "Migrate to the new apksig API"
...
am: da343de3ba
Change-Id: I4022a94ff5f7d4064e35204e42e69943cd3f2d57
2017-10-31 19:25:05 +00:00
Treehugger Robot
da343de3ba
Merge "Migrate to the new apksig API"
2017-10-31 19:19:52 +00:00
TreeHugger Robot
45b4c2bdc7
Merge "Switching build to use Launcher3 instead of Launcher2"
2017-10-31 18:58:08 +00:00
Tao Bao
edb35b85e2
releasetools: Fix the comment for '--verify' flag.
...
'-v' is not the abbreviation for '--verify' (but for '--verbose'
instead).
Test: N/A
Change-Id: I86339a1f7ea538d88ac6ed61595361531b79065c
2017-10-31 11:55:41 -07:00
Sunny Goyal
c65540bccf
Switching build to use Launcher3 instead of Launcher2
...
Bug: 67984089
Test: it builds
Change-Id: I92a6e4852d6367f5c42fc5e9686487a793b71afe
2017-10-31 09:25:53 -07:00
Victor Hsieh
d50662502f
Migrate to the new apksig API
...
Following the new API contract, this effectively add extra padding
before central dir to make it 4KB aligned.
Test: build succeeded
Bug: 30972906
Change-Id: I7cac9d2c4371b473c88df867b3b2ae906443db10
2017-10-31 08:24:02 -07:00
Justin Yun
d994eeee5d
resolve merge conflicts of eb247544a7
to oc-mr1-dev-plus-aosp
...
am: ef4f57af4a
Change-Id: I1530817977eede7f2163d0af3492a3eb45aaca84
2017-10-31 13:20:41 +00:00
Justin Yun
ef4f57af4a
resolve merge conflicts of eb247544a7
to oc-mr1-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib0c5ade0a1db65491b21226d5a2686ff6cf32d74
2017-10-31 15:27:52 +09:00
Justin Yun
eb247544a7
Merge "Use vndk-sp phony module for vndk-sp package list"
...
am: d75168135a
Change-Id: I660ac95e4ae8b1a966cb590157c23316234df4ce
2017-10-31 05:44:51 +00:00
Treehugger Robot
d75168135a
Merge "Use vndk-sp phony module for vndk-sp package list"
2017-10-31 05:36:53 +00:00
Dan Willemsen
2c3f8366e2
Mark some TARGET_* inputs as readonly
...
Nobody should be changing these past this point.
Test: build_test.bash
Change-Id: I6eb574a0b4d339912d4a09f8f752294871965041
2017-10-30 19:38:25 -07:00
Justin Yun
83c8f78e00
Use vndk-sp phony module for vndk-sp package list
...
To install the vndk-sp libraries defined in device/generic/common,
use vndk-sp phony module to list the libraries.
Bug: 65853349
Test: build aosp_x86-user and check emulator boot
Change-Id: Idf2d421b5d84e04e332db9cb357a46c898a89c4e
(cherry picked from commit 740c6a3c7c
)
2017-10-31 11:32:52 +09:00
Vishwath Mohan
4e6ba41c32
Merge "CFI compatibility with static executables and nested archives" am: 22b6abc96d
am: 1a8bee951e
...
am: a4b881b0b0
Change-Id: I3225a533da58c3f8a480816461234104da32addd
2017-10-31 02:04:36 +00:00
Vishwath Mohan
a4b881b0b0
Merge "CFI compatibility with static executables and nested archives" am: 22b6abc96d
...
am: 1a8bee951e
Change-Id: Ibf93f936d2f4df33ab554399459e8915c4308033
2017-10-31 01:56:02 +00:00
Vishwath Mohan
1a8bee951e
Merge "CFI compatibility with static executables and nested archives"
...
am: 22b6abc96d
Change-Id: Ie72297f286af9ecf0ffeea9d093351c2c7a82fa0
2017-10-31 01:50:56 +00:00
Vishwath Mohan
22b6abc96d
Merge "CFI compatibility with static executables and nested archives"
2017-10-31 01:42:16 +00:00
Colin Cross
2a54cf5295
Merge "Remove PRODUCT_AAPT2_CFLAGS and PRODUCT_AAPT_FLAGS" am: 8b664d0d96
am: 0f987bad82
...
am: c11a7444ff
Change-Id: I52f36d6a54c672084847821708681769be7141db
2017-10-30 21:23:50 +00:00
Colin Cross
c11a7444ff
Merge "Remove PRODUCT_AAPT2_CFLAGS and PRODUCT_AAPT_FLAGS" am: 8b664d0d96
...
am: 0f987bad82
Change-Id: I8505d76a1906fba682ad092b9f0964deeac33acb
2017-10-30 21:17:48 +00:00
Colin Cross
0f987bad82
Merge "Remove PRODUCT_AAPT2_CFLAGS and PRODUCT_AAPT_FLAGS"
...
am: 8b664d0d96
Change-Id: Id8331b1ed274356164d5949456c6d853045c3f47
2017-10-30 21:11:40 +00:00
Colin Cross
8b664d0d96
Merge "Remove PRODUCT_AAPT2_CFLAGS and PRODUCT_AAPT_FLAGS"
2017-10-30 20:58:08 +00:00
Dan Willemsen
ce9a40650d
Remove make version check
...
We should never be using make here anymore, only Kati.
Test: none
Change-Id: I6e716d76e3656c2bad1cf17c6de92bdeda763d5b
2017-10-30 13:52:47 -07:00
Dan Willemsen
9cddfc9891
Merge "Prevent using config.mk from make, clean up unused code" am: 41cc5022c1
am: 69cecba031
...
am: 2295cd6998
Change-Id: Ib611d45b7d4aa6589ca9cec72b95571f1b56c545
2017-10-30 20:39:52 +00:00
Dan Willemsen
2295cd6998
Merge "Prevent using config.mk from make, clean up unused code" am: 41cc5022c1
...
am: 69cecba031
Change-Id: I8fa09ad9a30ef90bda83380b96b693155c92ebf3
2017-10-30 20:33:48 +00:00
Dan Willemsen
69cecba031
Merge "Prevent using config.mk from make, clean up unused code"
...
am: 41cc5022c1
Change-Id: Ifbf6b6bac5875f29906e36d944183bc4d8a0bc74
2017-10-30 20:23:07 +00:00
Dan Willemsen
41cc5022c1
Merge "Prevent using config.mk from make, clean up unused code"
2017-10-30 20:11:32 +00:00
Stephen Hines
379d17dbe2
Merge "Switch to clang-4393122." am: 2957066979
am: f66ec58ca0
...
am: 258ea7188c
Change-Id: I71c518ea06a90faaeb803367abeb826575c3a56f
2017-10-30 20:07:48 +00:00
Stephen Hines
258ea7188c
Merge "Switch to clang-4393122." am: 2957066979
...
am: f66ec58ca0
Change-Id: I64463e6826c0920e93e7c808a8b4128a1b356f78
2017-10-30 19:58:19 +00:00
Stephen Hines
f66ec58ca0
Merge "Switch to clang-4393122."
...
am: 2957066979
Change-Id: If865d1df9b00cb4cd84b64bfec007c0ed4545edd
2017-10-30 19:46:12 +00:00
Stephen Hines
2957066979
Merge "Switch to clang-4393122."
2017-10-30 19:35:17 +00:00
Mathieu Chartier
b5ecb6581a
Add PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to go_defaults_common am: 99b2739a66
...
am: 356d58009c
Change-Id: I7c319ae376e0a6d7b094ad6629dffef757d9e508
2017-10-30 16:20:42 +00:00
Mathieu Chartier
356d58009c
Add PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to go_defaults_common
...
am: 99b2739a66
Change-Id: I24d503bc735a231b5e39c5a0745c3dacfdc64a15
2017-10-30 16:09:15 +00:00
Colin Cross
d5cce4c360
Remove PRODUCT_AAPT2_CFLAGS and PRODUCT_AAPT_FLAGS
...
PRODUCT_AAPT2_CFLAGS and PRODUCT_AAPT_FLAGS are only used to pass
--pseudo-localize. The flag doesn't need to be conditional on the
product, because the pseudo locale will be stripped out later if it
is not wanted. Having it conditional on the product causes the
AAPT2-compiled resources to vary between products, which causes
unnecessary rebuilds when swithcing products.
Remove the variables, always add --pseudo-localize, and move
the AAPT2 compiled output to the common intermediates.
Test: m checkbuild
Change-Id: Iacc914114616b5bd19d9a1011802f4f9bca9bc19
2017-10-27 16:25:55 -07:00
Bo Hu
620150fe24
Merge changes I85dfbc3a,I332bc4df,Ia6c3ff08,I28dad25e,Ib25ae4a1, ... into stage-aosp-master am: 0104049e4a
-s ours
...
am: 3424a614ac
-s ours
Change-Id: I8a625a72a9b7220f1e573b39ae2b4f32489a0606
2017-10-27 15:47:30 +00:00
Bo Hu
3424a614ac
Merge changes I85dfbc3a,I332bc4df,Ia6c3ff08,I28dad25e,Ib25ae4a1, ... into stage-aosp-master
...
am: 0104049e4a
-s ours
Change-Id: If1b853c9c6688de82a9cc3ead1eaeb4ca8078b28
2017-10-27 15:43:25 +00:00
Bo Hu
0104049e4a
Merge changes I85dfbc3a,I332bc4df,Ia6c3ff08,I28dad25e,Ib25ae4a1, ... into stage-aosp-master
...
* changes:
emulator: fix widevine drm vndbinder denial
emulator: fix selinux issues
emulator: squash misc modifications from oc-emu-dev
emualtor: keep libopenjdkjvmti*.so on sdk images
emulator: move rild.libpath to vendor
sdk:enable emulator to launch in build environment
build-emulator: fully treblize emulator image
Build vendor image for emulator
2017-10-27 15:35:21 +00:00
Vishwath Mohan
3d3e1cf260
CFI compatibility with static executables and nested archives
...
This CL makes the following changes:
(a) It disables diagnostics for CFI which requires the runtime ubsan
library (which isn't included in static executables).
(b) It applies the ar flags for CFI correctly for nested .a
archives.
(c) Applies the version script to export CFI shadow for non-static
binaries
(d) Doesn't apply cross-dso CFI for static executables
Bug: 30227045
Test: Static executables build correctly and do not complain about
missing symbols from the ubsan runtime library.
Test: Nested .a files correctly use the gold plugin.
Change-Id: Id8fe3c13f6b76565aafbf1266e95f50d1447a790
2017-10-27 03:26:27 -07:00