Daniel Cardenas
07f4a0e49c
Merge "PDK fix. Remove conditional that stops component from being in PDK." am: 4578bf1f96
am: 212f32d7d1
...
am: a8653af161
Change-Id: I040a006ca5d78a2d92bd17b76f8c52e0042a4a46
2017-11-06 22:08:11 +00:00
Andreas Gampe
47392c41ff
Merge "Build: Enable minidebuginfo generation" am: ca677112f0
am: 01e6cae2cb
...
am: 4e347f9dce
Change-Id: I26b0dce798b5ef5b0bf7826eeaa987deef4c7290
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
Change-Id: Ib987d0d96774e536e1f9f0033bd0993ff0797d77
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
Change-Id: Ib2de81d0dc28ba6294a0566b27bf49a9ca671cb7
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
Change-Id: Ibdff632204ae04da89cd9d1f43474bc5a52be784
2017-11-06 22:02:33 +00:00
Andreas Gampe
4e347f9dce
Merge "Build: Enable minidebuginfo generation" am: ca677112f0
...
am: 01e6cae2cb
Change-Id: I958eec8297a937f411002ba9fdab0eb852a65848
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
Change-Id: I9db667776cfa95847cec0b1c11c062357759daab
2017-11-06 22:01:04 +00:00
Isaac Chen
5cd6fd64fb
Merge "Move emulator specific configurations to vendor" am: 8930bf679b
...
am: 4d8e808a0b
-s ours
Change-Id: I8088efbae393871ebe02546c56f6cfea520e0681
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
Change-Id: Ib8c2c24a94ad96d182d547274fd9eaaf2f89fd7b
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
Change-Id: Idc1950359c1aba34dccd5193a0738f415a032ff9
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
Pirama Arumuga Nainar
d4a9a3281e
Merge "Remove CFI-related WAR that is no longer necessary"
...
am: 76ceec724f
Change-Id: I17c0d41482c78bc7ae0fb762d30e82d7a13e0091
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
Change-Id: Ie2ebd2cf1ff97349d7858b3dd83751a4ec78f368
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
Change-Id: I1b6e73e4b8c06d71eb8d4a4c4ea50744be94bff0
2017-11-04 01:35:51 +00:00
Colin Cross
31638ff73b
Merge "Move BUILD_*_FROM_FILE to config.mk" am: ab5ce7e1fe
...
am: 9159f4b08c
Change-Id: Ib946129ef14cf91aa57a1fb880dae3f29adace63
2017-11-04 01:32:19 +00:00
Colin Cross
9159f4b08c
Merge "Move BUILD_*_FROM_FILE to config.mk"
...
am: ab5ce7e1fe
Change-Id: I48441cd072e761147745ed7ca85c82f037f7c74a
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
Change-Id: I3b3652eb5de3db3910d0621a6eae68362ad39b07
2017-11-04 01:05:21 +00:00
Dan Willemsen
7e064adde4
Merge "Switch deprecation message to $(warning)" am: 884af82b27
...
am: 2adb61215b
Change-Id: I35f623e2502a42db24c47c6fd129277fad8f086f
2017-11-04 01:01:14 +00:00
Dan Willemsen
2adb61215b
Merge "Switch deprecation message to $(warning)"
...
am: 884af82b27
Change-Id: I3a1c904ee81f938b7ed10282eac8a6c67e081f8c
2017-11-04 00:57:10 +00:00
Treehugger Robot
884af82b27
Merge "Switch deprecation message to $(warning)"
2017-11-04 00:50:14 +00:00
Adam Seaton
bf57d78c24
Merge "Update Security String to 2017-12-05 for December Security Bug: 67774760" into oc-dev am: 8fdda7d80d
am: 4ec4999b54
am: b6cd7f71f9
...
am: 3a2b775a96
Change-Id: I35ed5c50c7c151db4aff1c48483f7e450822dce3
2017-11-04 00:04:46 +00:00
Adam Seaton
3a2b775a96
Merge "Update Security String to 2017-12-05 for December Security Bug: 67774760" into oc-dev am: 8fdda7d80d
am: 4ec4999b54
...
am: b6cd7f71f9
Change-Id: I59598976c3f62cb11bc80c51c66ebf88395a720e
2017-11-04 00:00:43 +00:00
Adam Seaton
b6cd7f71f9
Merge "Update Security String to 2017-12-05 for December Security Bug: 67774760" into oc-dev am: 8fdda7d80d
...
am: 4ec4999b54
Change-Id: I1fc9a861ca5fc9c641e44dfb14fa6e23bb656e93
2017-11-03 23:58:40 +00:00
Adam Seaton
4ec4999b54
Merge "Update Security String to 2017-12-05 for December Security Bug: 67774760" into oc-dev
...
am: 8fdda7d80d
Change-Id: Ib1b6381be2565f9cb5d9e5e8a798de8240592774
2017-11-03 23:54:45 +00:00
TreeHugger Robot
8fdda7d80d
Merge "Update Security String to 2017-12-05 for December Security Bug: 67774760" into oc-dev
2017-11-03 23:51:15 +00:00
Colin Cross
e96bfdb337
Move BUILD_*_FROM_FILE to config.mk
...
BUILD_NUMBER_FROM_FILE and BUILD_DATETIME_FROM_FILE may need to
be referenced before main.mk has been parsed, move them to config.mk.
Bug: 68865363
Test: m -j TARGET_PRODUCT=full TARGET_BUILD_APPS=Gallery
aapt dump xmltree out/target/product/generic/obj/APPS/Gallery_intermediates/package.apk AndroidManifest.xml | grep Version
Change-Id: I9361a394469e61fcdf5a2b9509ef2bb2b373d6e7
2017-11-03 16:35:02 -07:00
Dan Willemsen
52f74821d3
Switch deprecation message to $(warning)
...
This way it shows up when using the old copy of lunch, which hides
stdout.
Test: source old_envsetup; lunch aosp_marlin-eng
Change-Id: I4bccf37fe69c0d7affb5805d05a2750e5d9a3da4
2017-11-03 15:52:50 -07:00
Jin Qian
4cc5ce2be1
Merge "Remove mkuserimg.sh from otatools" am: 1d5f330c5b
am: bab32f2f24
...
am: 512e8651bd
Change-Id: Ia63454c6cb66d8e20f05774617280d1a21bb91fb
2017-11-03 22:20:42 +00:00
Jin Qian
512e8651bd
Merge "Remove mkuserimg.sh from otatools" am: 1d5f330c5b
...
am: bab32f2f24
Change-Id: Ib5a30479a4182dc11752b239895b8214e27e7c64
2017-11-03 22:17:11 +00:00
Jin Qian
bab32f2f24
Merge "Remove mkuserimg.sh from otatools"
...
am: 1d5f330c5b
Change-Id: I3598eb310924ab37f459e786e7a7df6ce24e9e49
2017-11-03 22:13:02 +00:00
Andreas Gampe
0f3e16aad2
Build: Enable minidebuginfo generation
...
Enable generation of minidebuginfo through dex2oat by default.
Test: m
Test: adb shell cmd package compile -f -a
Change-Id: I70f7a1ca4939e7992ba2a7b607e8ce9bd6e0b918
2017-11-03 14:37:32 -07:00
Treehugger Robot
1d5f330c5b
Merge "Remove mkuserimg.sh from otatools"
2017-11-03 21:26:36 +00:00
Jin Qian
09f3d18d56
Remove mkuserimg.sh from otatools
...
It has been replaced with mkuserimg_mke2fs.sh
Bug: 64395169
Change-Id: Iff4edba35062b6ecd3fec8b65422cab2a0707d3f
2017-11-03 12:16:15 -07:00
Jin Qian
44edd9a9a1
Merge "Replace make_ext4fs with mke2fs" am: bd532fbf2e
am: 3f2bf55726
...
am: a08e72372e
Change-Id: I3fef2c24e4795e4b9a146f1e7ee9953c3e5f5db6
2017-11-03 18:57:59 +00:00
Jin Qian
a08e72372e
Merge "Replace make_ext4fs with mke2fs" am: bd532fbf2e
...
am: 3f2bf55726
Change-Id: I413967d1e6f479d8899e906aa4a5d597107c77de
2017-11-03 18:03:20 +00:00
Jin Qian
3f2bf55726
Merge "Replace make_ext4fs with mke2fs"
...
am: bd532fbf2e
Change-Id: Iea994024e4483f79d1560e21ddc4db7136f540c5
2017-11-03 17:39:11 +00:00
Jin Qian
bd532fbf2e
Merge "Replace make_ext4fs with mke2fs"
2017-11-03 17:28:57 +00:00
Alan Leung
7b1301a593
Merge "Workaround for USE_D8 not in --dumpvars-mode" am: 44bfeedaa3
am: ad24414dae
...
am: b26af8afbe
Change-Id: I14744ab02e91aecaff666c3350cc5082db21404c
2017-11-03 03:40:42 +00:00
Alan Leung
b26af8afbe
Merge "Workaround for USE_D8 not in --dumpvars-mode" am: 44bfeedaa3
...
am: ad24414dae
Change-Id: Ifa370b15120411f813e15a4210f70ec3fc0b69d6
2017-11-03 03:38:34 +00:00
Alan Leung
ad24414dae
Merge "Workaround for USE_D8 not in --dumpvars-mode"
...
am: 44bfeedaa3
Change-Id: Ife6c221e1e4e8181d4aab763cf758751c4af7d2a
2017-11-03 03:33:54 +00:00
Treehugger Robot
44bfeedaa3
Merge "Workaround for USE_D8 not in --dumpvars-mode"
2017-11-03 03:28:51 +00:00
Tao Bao
365bb41b01
Merge "releasetools: Fix the doctest for rangelib.py." am: 7e85dd9dc0
am: 2b38618a62
...
am: ed6f6bc272
Change-Id: I83fd2157ef4fbc9eee6151146d47f3257b9066b5
2017-11-03 00:31:29 +00:00
Tao Bao
ed6f6bc272
Merge "releasetools: Fix the doctest for rangelib.py." am: 7e85dd9dc0
...
am: 2b38618a62
Change-Id: Ib7835fe53b81a39903b8422cb6931b011788f0bb
2017-11-03 00:26:48 +00:00
Tao Bao
2b38618a62
Merge "releasetools: Fix the doctest for rangelib.py."
...
am: 7e85dd9dc0
Change-Id: I703e8276d1325aa69671eb48676b6e864f3fca8d
2017-11-03 00:24:06 +00:00