Adam Seaton
b62cd71b07
DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d
am: 5281508c37
am: bb768aa837
...
am: 92380f630e
-s ours
Change-Id: I8a51b543b0269b92ca87f80bdc5a91db3dacb84e
2017-03-16 16:44:43 +00:00
Adam Seaton
f773f981bb
Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7
...
am: d5894faefd
Change-Id: Ibe7c5aa0d259e9cf2e7cbb9c4a5b5419e3eed283
2017-03-16 16:42:00 +00:00
Adam Seaton
959da97bba
DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca
-s ours am: 9921f826fe
am: 88ba3a3bf8
-s ours
...
am: fc869b58e8
Change-Id: Ibd6463edf17bebc31ff43676d9a8b22314524577
2017-03-16 16:41:49 +00:00
Adam Seaton
7723fd8988
DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487
am: e4ced7a432
...
am: 84869ab1e2
Change-Id: I9c5be058a27139b73fb331248c682f17a9bfbfe1
2017-03-16 16:41:49 +00:00
Adam Seaton
b3b5777fff
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a
am: f19c200a49
am: 4826d7e492
-s ours
...
am: 1b9f1e8156
-s ours
Change-Id: I05a6a8899f3c974934ab8929642fc17f4131dacc
2017-03-16 16:41:47 +00:00
Adam Seaton
8edd5d7e30
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467
am: 7b35a39690
am: 645af9a302
-s ours
...
am: 5e0c5f0263
-s ours
Change-Id: I9a9c1d88f083e3284c0f5aa29c60b436a02991d7
2017-03-16 16:41:44 +00:00
Adam Seaton
6962385144
DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277
-s ours am: 637f66925f
am: 3481be638f
-s ours
...
am: d4f9e95f7c
Change-Id: Ic92722bd08f326c4c7e99a36ec6b8d4ff6f4caae
2017-03-16 16:41:44 +00:00
Adam Seaton
92380f630e
DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d
am: 5281508c37
...
am: bb768aa837
Change-Id: Ia9e209b1b11712230b2e0ce4a968e2c119b4dd9c
2017-03-16 16:41:44 +00:00
Adam Seaton
751d4cd04e
Update Security String to 2017-05-01 on nyc-dev am: 573e7e75ca
...
am: 368d0a8a42
Change-Id: I009a8d76a744afded3ef11b6c2485d5e7a9d9d31
2017-03-16 16:41:43 +00:00
Adam Seaton
d5894faefd
Update Security String to 2017-05-05 on nyc-dev
...
am: cfdcc41cd7
Change-Id: I2e1144bca4f0429e06624eadc7a3ca5b83e299d0
2017-03-16 16:39:28 +00:00
Adam Seaton
84869ab1e2
DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487
...
am: e4ced7a432
Change-Id: I03e2baa012ecec53cd62d098d9b57f0f1c8b33f6
2017-03-16 16:39:19 +00:00
Adam Seaton
fc869b58e8
DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca
-s ours am: 9921f826fe
...
am: 88ba3a3bf8
-s ours
Change-Id: I938c87c6381b0a9b3879af9ac16c85c82628d6c6
2017-03-16 16:39:17 +00:00
Adam Seaton
1b9f1e8156
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a
am: f19c200a49
...
am: 4826d7e492
-s ours
Change-Id: Icd9c4018e5dc1b9f7857c8d3ca427381edd1beed
2017-03-16 16:39:16 +00:00
Adam Seaton
d4f9e95f7c
DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277
-s ours am: 637f66925f
...
am: 3481be638f
-s ours
Change-Id: I65dba25b8055f2339723905b06da9723ba4b5f6a
2017-03-16 16:39:13 +00:00
Adam Seaton
bb768aa837
DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d
...
am: 5281508c37
Change-Id: I2b758951b7d5c496cd060621ebda3afe1b72f6ea
2017-03-16 16:39:13 +00:00
Adam Seaton
368d0a8a42
Update Security String to 2017-05-01 on nyc-dev
...
am: 573e7e75ca
Change-Id: I04549e4c2926780d8e78edca3ca9f98615b00e97
2017-03-16 16:39:13 +00:00
Adam Seaton
5e0c5f0263
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467
am: 7b35a39690
...
am: 645af9a302
-s ours
Change-Id: I53784956ca6ec3d1b8f8585bfc547a8bfaee3f3e
2017-03-16 16:39:12 +00:00
Adam Seaton
cfdcc41cd7
Update Security String to 2017-05-05 on nyc-dev
...
Bug:34137924
2017-03-16 16:36:36 +00:00
Adam Seaton
88ba3a3bf8
DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca
-s ours
...
am: 9921f826fe
Change-Id: I5b5b9756e27e84edb95b5492140c47be3b200df0
2017-03-16 16:36:18 +00:00
Adam Seaton
e4ced7a432
DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev
...
am: fa157ee487
Change-Id: I417423cc171b4906dac7d0707a358b6fc85a02d9
2017-03-16 16:36:18 +00:00
Adam Seaton
4826d7e492
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a
...
am: f19c200a49
Change-Id: I2619378284b988335721a9d379efcae9e634e7a8
2017-03-16 16:36:17 +00:00
Adam Seaton
3481be638f
DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277
-s ours
...
am: 637f66925f
Change-Id: I16eaed880c8c82a432783565541be9292df620b4
2017-03-16 16:36:14 +00:00
Adam Seaton
5281508c37
DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev
...
am: 07a0f6968d
Change-Id: I2712458e76c2d43f946130b74feb42b31d75f1f8
2017-03-16 16:36:14 +00:00
Adam Seaton
645af9a302
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467
...
am: 7b35a39690
Change-Id: Iac15bfd4018b152302e13f12a0f5a05e85d010e4
2017-03-16 16:36:14 +00:00
Adam Seaton
f19c200a49
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev
...
am: 3d0850957a
Change-Id: I4d62b1d3b809b1be366b649d6cd2cf036f0020b3
2017-03-16 16:32:46 +00:00
Adam Seaton
9921f826fe
DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev
...
am: baf29229ca
-s ours
Change-Id: Ie6771d5808069e6285b7497b013de430d1dad818
2017-03-16 16:32:45 +00:00
Adam Seaton
7b35a39690
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev
...
am: 41d659c467
Change-Id: I132559a9f492d3220ab8861e3575d27cb1635646
2017-03-16 16:32:43 +00:00
Adam Seaton
637f66925f
DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev
...
am: e0b38c6277
-s ours
Change-Id: Idcd643e5e7ce612f567b3ca8a64b9e0880108423
2017-03-16 16:32:42 +00:00
Adam Seaton
573e7e75ca
Update Security String to 2017-05-01 on nyc-dev
...
Bug:34137924
2017-03-16 16:31:51 +00:00
Jaekyun Seok
a7e65dbf90
Remove media config file copy rule
...
ag/1923309 and ag/1918350 have already moved them into vendor
partition.
Test: building succeeded.
Bug: 35653062
Change-Id: Idcf1b481fb043867bb64ff7c63800c44a151f32d
2017-03-16 17:48:41 +09:00
Miao Wang
0c386896c9
Merge "Add TARGET_OUT_VENDOR_RENDERSCRIPT_BITCODE definition." am: 3fd80635af
am: 45976ab0c9
...
am: b3ccb7679b
Change-Id: Ia7253e725bf5a410a223eef46eec9befc1952537
2017-03-16 06:54:55 +00:00
Miao Wang
b3ccb7679b
Merge "Add TARGET_OUT_VENDOR_RENDERSCRIPT_BITCODE definition." am: 3fd80635af
...
am: 45976ab0c9
Change-Id: I589c78fe9c4e216edebc59c56042fdfadcae1ffd
2017-03-16 06:52:22 +00:00
Miao Wang
45976ab0c9
Merge "Add TARGET_OUT_VENDOR_RENDERSCRIPT_BITCODE definition."
...
am: 3fd80635af
Change-Id: Id6c164577684e0ed03e8ff1adf29d4648cf31f6c
2017-03-16 06:49:54 +00:00
Treehugger Robot
3fd80635af
Merge "Add TARGET_OUT_VENDOR_RENDERSCRIPT_BITCODE definition."
2017-03-16 06:45:48 +00:00
Jiyong Park
a2a63dd52d
Merge "Silence module path warnings for a while" am: d5c3d1366f
am: 42fc6363a6
...
am: 9a28a6443c
Change-Id: Ie6c62ada01dbf6c8659fed8d43b9ab6193a100f0
2017-03-16 05:59:04 +00:00
Jiyong Park
9a28a6443c
Merge "Silence module path warnings for a while" am: d5c3d1366f
...
am: 42fc6363a6
Change-Id: Ic02414fe5f179ea2fa891416635b5b5ff36e84c8
2017-03-16 05:57:33 +00:00
Jiyong Park
42fc6363a6
Merge "Silence module path warnings for a while"
...
am: d5c3d1366f
Change-Id: I9bc012f72dd347b725c1104c22eb84940966df5c
2017-03-16 05:54:32 +00:00
Treehugger Robot
d5c3d1366f
Merge "Silence module path warnings for a while"
2017-03-16 05:49:25 +00:00
bohu
8c3364bd59
Emulator: Enable logcat -Q to run in emulator
...
Create qemu_cmdline property and make sure logcat
can read it.
Change-Id: I83261a1ba29ecf9fd9b51a815425742177018c87
2017-03-15 22:27:08 -07:00
Adam Lesinski
981de838d4
Add LOCAL_ASSET_DIR support (-A) to aapt2
...
Although performing the inclusion of assets/ at a later stage is
preferable, (since aapt just copies the files) do the easy thing and
support what aapt did. In the future perhaps we can zip up the
assets/ directories when also merging in the classes.dex.
Bug: 35461578
Change-Id: I7d7fde43333ea6455c4a1b9113bd25e1d88b7dd5
Test: manual
2017-03-16 04:53:05 +00:00
TreeHugger Robot
5a6dafc945
Merge "Enforce RROs for all the build-time ROs"
2017-03-16 04:25:48 +00:00
Jiyong Park
79f5918199
Silence module path warnings for a while
...
Warning messages like, "libart_fake: framework library must be installed
to system/lib64 but requested to be installed at system/fake-libs64.
Please fix.", are temporarily muted since some of those warnings might
be false alarms.
Let's just silence the warning for everybody and investigate the cases
internally by turning on the build flag SHOW_MODULE_PATH_WARNINGS.
Test: the warning messages should not be shown unless built with
SHOW_MODULE_PATH_WARNINGS=true.
Change-Id: I5eb3ab3385c92a5192723ff1008277c321162191
2017-03-16 12:57:21 +09:00
Simran Basi
c8f21f6c4e
device-tests & general-tests: build out zips.
...
Generates the output zips of the device-tests & general-tests
buildable suites.
Bug: 35386840
Test: make dist device-tests general-tests -j
Change-Id: I253bcd8615379334b52b4d770a5c4f7e07a58795
2017-03-15 17:56:50 -07:00
Dimitry Ivanov
d994a73989
Add ld.config.txt to rootdir/etc
...
This file is used by linker to create custom namespace
configuration for binaries.
Bug: http://b/30706810
Test: m
Change-Id: Ifc4e43ed51c6906c75a7f0d9f00a816b5e16c4d8
2017-03-15 14:47:35 -07:00
Alex Klyubin
71d223b8c3
Merge "Remove unused /selinux_version" am: f32107fbb2
am: ac5ac23bb3
...
am: 561e101ec9
Change-Id: I25fed6576441cbd329bb0228ff47c625172c8444
2017-03-15 20:15:42 +00:00
Alex Klyubin
561e101ec9
Merge "Remove unused /selinux_version" am: f32107fbb2
...
am: ac5ac23bb3
Change-Id: I8d134c0e0829876adea15ab43a5d798cc9533a1d
2017-03-15 20:10:11 +00:00
Alex Klyubin
ac5ac23bb3
Merge "Remove unused /selinux_version"
...
am: f32107fbb2
Change-Id: Iba4f3d7eca37bbf20d9527245baf44f32b67c07f
2017-03-15 20:05:15 +00:00
Treehugger Robot
f32107fbb2
Merge "Remove unused /selinux_version"
2017-03-15 19:59:03 +00:00
Colin Cross
7ec20311d9
resolve merge conflicts of da00e137ec
to stage-aosp-master am: 2afade582d
...
am: 47f8853220
-s ours
Change-Id: I01fa23366bf9318d6fa49acc3420f96684425737
2017-03-15 18:35:37 +00:00
Colin Cross
47f8853220
resolve merge conflicts of da00e137ec
to stage-aosp-master
...
am: 2afade582d
Change-Id: I17e69cae25f1f8fb4befbfcda6154a2fe9a2df9b
2017-03-15 18:30:37 +00:00