Dan Willemsen
b6a3564609
Merge "Add PRODUCT_ADB_KEYS" am: f599f4010e am: 617dce0c29
...
am: 06870ee92b
2017-11-08 03:28:38 +00:00
Dan Willemsen
06870ee92b
Merge "Add PRODUCT_ADB_KEYS" am: f599f4010e
...
am: 617dce0c29
2017-11-08 03:26:35 +00:00
Dan Willemsen
617dce0c29
Merge "Add PRODUCT_ADB_KEYS"
...
am: f599f4010e
2017-11-08 03:23:29 +00:00
Treehugger Robot
f599f4010e
Merge "Add PRODUCT_ADB_KEYS"
2017-11-08 03:12:17 +00:00
Jaekyun Seok
1e972a863f
Merge changes from topic "system_default_prop" am: 4cb631f624 am: bc94fb4340
...
am: 5f035cbbde
2017-11-08 02:22:54 +00:00
Jaekyun Seok
5f035cbbde
Merge changes from topic "system_default_prop" am: 4cb631f624
...
am: bc94fb4340
2017-11-08 01:55:32 +00:00
Jaekyun Seok
bc94fb4340
Merge changes from topic "system_default_prop"
...
am: 4cb631f624
2017-11-08 01:52:02 +00:00
Treehugger Robot
4cb631f624
Merge changes from topic "system_default_prop"
...
* changes:
Move ART default properties into system partition
Add PRODUCT_SYSTEM_DEFAULT_PROPERTIES
2017-11-08 01:42:40 +00:00
Jaekyun Seok
5fb6a3eb9f
Move ART default properties into system partition
...
Bug: 64661857
Bug: 68755013
Test: confirmed that ART default properties were stored in
/system/etc/prop.default on sailfish device
Change-Id: Ie07d3049de5ac395cfb9105e208fe7825080fa15
2017-11-08 00:56:43 +00:00
Tianjie Xu
b2f60c0611
Merge "Fix the imgdiff failure when running test_common unittest" am: 7136100be6 am: 2b8489cf45
...
am: 929c7c6c81
2017-11-08 00:03:55 +00:00
Tianjie Xu
929c7c6c81
Merge "Fix the imgdiff failure when running test_common unittest" am: 7136100be6
...
am: 2b8489cf45
2017-11-07 23:53:42 +00:00
Tianjie Xu
2b8489cf45
Merge "Fix the imgdiff failure when running test_common unittest"
...
am: 7136100be6
2017-11-07 23:48:04 +00:00
Tianjie Xu
7136100be6
Merge "Fix the imgdiff failure when running test_common unittest"
2017-11-07 23:40:20 +00:00
Tianjie Xu
df055580d0
Fix the imgdiff failure when running test_common unittest
...
imgdiff fails on plain strings after we put more checks the input
data. This leads to failure when running unittest
"test_recovery_from_boot". The CL fixes the issue by serving gzipped
dummy images as the test input.
Bug: 68988329
Test: InstallRecoveryScriptFormatTest passes
Change-Id: I1952b311681ac4f39c0e51aef1de1177aebeac43
2017-11-07 12:38:08 -08:00
TreeHugger Robot
76fd690d29
Merge "Error when an abstract method is added to a released class."
2017-11-07 18:23:20 +00:00
Isaac Chen
c72ebd8f2e
Move emulator specific configurations to vendor
...
am: 5bf9ac508c
2017-11-07 05:37:16 +00:00
Isaac Chen
5bf9ac508c
Move emulator specific configurations to vendor
...
The moved files are all emulator specific so should reside in vendor
directory/partition. This modification resolves a Launcher crash
issue when GSI boots on the emulator. Directly relevant file is
handheld_core_hardware.xml, which is absent from the GSI.
All other files moved in this change can cause similar issues (if they
stay under /system) since they aren't present on GSI, either.
Bug: 67987112
Test: x86 GSI boots to home screenon with 2 emulator products, aosp_x86,
and sdk_gphone_x86 on the x86 emulator (on internal master).
Both aosp_x86 and aosp_x86_64 boot to home screen on the emulator.
Both aosp_arm and sdk_phone_arm boot to home screen on the arm
emulator.
Change-Id: I2ff4f71b89d84dab322d00cf846cf06c98a1e8a7
2017-11-07 11:41:51 +08:00
Dan Willemsen
acaf1a5ed4
Merge changes Ib37508d4,Ia46ac30e am: dcd46870f2 am: 550fa7b4d3
...
am: 67f4bccdbb
2017-11-06 23:07:35 +00:00
Dan Willemsen
67f4bccdbb
Merge changes Ib37508d4,Ia46ac30e am: dcd46870f2
...
am: 550fa7b4d3
2017-11-06 23:04:35 +00:00
Dan Willemsen
550fa7b4d3
Merge changes Ib37508d4,Ia46ac30e
...
am: dcd46870f2
2017-11-06 23:00:34 +00:00
Dan Willemsen
dcd46870f2
Merge changes Ib37508d4,Ia46ac30e
...
* changes:
Turn off Windows builds during BUILD_HOST_static
zipalign: Fix build failure in static_sdk_tools.
2017-11-06 22:53:46 +00:00
Jeff Gaston
d65e7146f6
Merge changes I30a83721,I1094f213 am: 85e391b2a2 am: b1a611e5fa
...
am: 4206302c89
2017-11-06 22:24:32 +00:00
Jeff Gaston
4206302c89
Merge changes I30a83721,I1094f213 am: 85e391b2a2
...
am: b1a611e5fa
2017-11-06 22:21:59 +00:00
Jeff Gaston
b1a611e5fa
Merge changes I30a83721,I1094f213
...
am: 85e391b2a2
2017-11-06 22:19:38 +00:00
Treehugger Robot
85e391b2a2
Merge changes I30a83721,I1094f213
...
* changes:
Validate args passed by jacoco.mk to rm -rf
Implement validate-paths-are-subdirs
2017-11-06 22:10:41 +00:00
Daniel Cardenas
07f4a0e49c
Merge "PDK fix. Remove conditional that stops component from being in PDK." am: 4578bf1f96 am: 212f32d7d1
...
am: a8653af161
2017-11-06 22:08:11 +00:00
Andreas Gampe
47392c41ff
Merge "Build: Enable minidebuginfo generation" am: ca677112f0 am: 01e6cae2cb
...
am: 4e347f9dce
2017-11-06 22:07:08 +00:00
Pirama Arumuga Nainar
6926706fe5
Merge "Remove CFI-related WAR that is no longer necessary" am: 76ceec724f am: d4a9a3281e
...
am: 306b13aa17
2017-11-06 22:06:10 +00:00
Isaac Chen
2512ed100b
Merge "Move emulator specific configurations to vendor" am: 8930bf679b am: 4d8e808a0b -s ours
...
am: 5cd6fd64fb
2017-11-06 22:05:16 +00:00
Daniel Cardenas
a8653af161
Merge "PDK fix. Remove conditional that stops component from being in PDK." am: 4578bf1f96
...
am: 212f32d7d1
2017-11-06 22:02:33 +00:00
Andreas Gampe
4e347f9dce
Merge "Build: Enable minidebuginfo generation" am: ca677112f0
...
am: 01e6cae2cb
2017-11-06 22:01:47 +00:00
Pirama Arumuga Nainar
306b13aa17
Merge "Remove CFI-related WAR that is no longer necessary" am: 76ceec724f
...
am: d4a9a3281e
2017-11-06 22:01:04 +00:00
Isaac Chen
5cd6fd64fb
Merge "Move emulator specific configurations to vendor" am: 8930bf679b
...
am: 4d8e808a0b
2017-11-06 22:00:04 +00:00
Daniel Cardenas
212f32d7d1
Merge "PDK fix. Remove conditional that stops component from being in PDK."
...
am: 4578bf1f96
2017-11-06 21:56:52 +00:00
Treehugger Robot
4578bf1f96
Merge "PDK fix. Remove conditional that stops component from being in PDK."
2017-11-06 21:54:13 +00:00
Andreas Gampe
01e6cae2cb
Merge "Build: Enable minidebuginfo generation"
...
am: ca677112f0
2017-11-06 21:50:21 +00:00
Treehugger Robot
ca677112f0
Merge "Build: Enable minidebuginfo generation"
2017-11-06 21:45:46 +00:00
Daniel Cardenas
429e5a6363
PDK fix. Remove conditional that stops component from being in PDK.
...
Bug: 67663308
Test: Build on master and PDK branch
Change-Id: I101452230376c4c509004cf6d03070ce85620e89
2017-11-06 11:57:06 -08:00
Dan Willemsen
2a6e3b00b0
Turn off Windows builds during BUILD_HOST_static
...
We can only create static host binaries for Linux, so if static host
binaries are requested, turn off Windows cross-builds.
Test: m zipalign BUILD_HOST_static=1
Change-Id: Ib37508d4b502cd56dad535cb6eab648f625486c6
2017-11-06 11:12:09 -08:00
Narayan Kamath
887c645e02
zipalign: Fix build failure in static_sdk_tools.
...
Convert all dependencies to static deps.
Test: make -j50 static_sdk_tools BUILD_HOST_static=1
Bug: 35246701
Bug: 68804545
Change-Id: Ia46ac30e5c05226f1bfec82a84f05e4be945bf74
2017-11-06 11:12:08 -08:00
Pirama Arumuga Nainar
d4a9a3281e
Merge "Remove CFI-related WAR that is no longer necessary"
...
am: 76ceec724f
2017-11-06 18:57:18 +00:00
Treehugger Robot
76ceec724f
Merge "Remove CFI-related WAR that is no longer necessary"
2017-11-06 18:54:45 +00:00
Isaac Chen
4d8e808a0b
Merge "Move emulator specific configurations to vendor"
...
am: 8930bf679b
2017-11-06 06:21:25 +00:00
Isaac Chen
8930bf679b
Merge "Move emulator specific configurations to vendor"
2017-11-06 06:18:04 +00:00
Pirama Arumuga Nainar
a8f75983a4
Remove CFI-related WAR that is no longer necessary
...
Bug: http://b/33678192
Clang has been updated past the revision mentioned in the work around.
So this is no longer necessary.
Test: Build
Change-Id: I08f8e75936bbc3527abc86ba4ce0f2c10382d332
2017-11-04 16:18:29 -07:00
Colin Cross
2a843f1b15
Merge "Move BUILD_*_FROM_FILE to config.mk" am: ab5ce7e1fe am: 9159f4b08c
...
am: 31638ff73b
2017-11-04 01:35:51 +00:00
Colin Cross
31638ff73b
Merge "Move BUILD_*_FROM_FILE to config.mk" am: ab5ce7e1fe
...
am: 9159f4b08c
2017-11-04 01:32:19 +00:00
Colin Cross
9159f4b08c
Merge "Move BUILD_*_FROM_FILE to config.mk"
...
am: ab5ce7e1fe
2017-11-04 01:30:14 +00:00
Treehugger Robot
ab5ce7e1fe
Merge "Move BUILD_*_FROM_FILE to config.mk"
2017-11-04 01:22:26 +00:00
Dan Willemsen
6a9785aea4
Merge "Switch deprecation message to $(warning)" am: 884af82b27 am: 2adb61215b
...
am: 7e064adde4
2017-11-04 01:05:21 +00:00
