Commit Graph

40667 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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
Treehugger Robot 7e85dd9dc0 Merge "releasetools: Fix the doctest for rangelib.py." 2017-11-03 00:18:19 +00:00
Jin Qian 95b2b695cd Replace make_ext4fs with mke2fs
make_ext4fs is deprecated and should be replaced with mke2fs

Bug: 64395169
Change-Id: Idfc8c0ee0ff598fdaa6f20bb0d4f6dca687a1b10
2017-11-02 16:27:41 -07:00
Alan Leung 65168a4143 Workaround for USE_D8 not in --dumpvars-mode
Bug: 68406220
Test: m checkbuild && USE_D8=false m checkbuild
Change-Id: Ia9916fb69b22449ff9eadd334f135807d999276f
2017-11-02 15:31:03 -07:00
Jin Qian 511fb3a77d Merge "Always use MKE2FS to build ext4 image" am: dee5abd85a
am: d4fcfea77c

Change-Id: I237659e202dcedc2fefffec0ea95891fd6c5bbfa
2017-11-02 21:46:09 +00:00
Jin Qian d4fcfea77c Merge "Always use MKE2FS to build ext4 image"
am: dee5abd85a

Change-Id: I2739bb6a533fd5161e0ab11382245e0791e29e09
2017-11-02 21:44:02 +00:00
Treehugger Robot dee5abd85a Merge "Always use MKE2FS to build ext4 image" 2017-11-02 21:34:49 +00:00
Tao Bao c0dcbd0017 releasetools: Fix the doctest for rangelib.py.
$ python rangelib.py
**********************************************************************
File "rangelib.py", line 323, in __main__.RangeSet.next_item
Failed example:
    list(rangelib.RangeSet("10-19 3 5 7").next_item())
Exception raised:
    Traceback (most recent call last):
      File "/usr/lib/python2.7/doctest.py", line 1315, in __run
        compileflags, 1) in test.globs
      File "<doctest __main__.RangeSet.next_item[2]>", line 1, in <module>
        list(rangelib.RangeSet("10-19 3 5 7").next_item())
    NameError: name 'rangelib' is not defined
**********************************************************************
1 items had failures:
   1 of   3 in __main__.RangeSet.next_item
***Test Failed*** 1 failures.

Test: python rangelib.py
Change-Id: I6c791ff4453f40d90b34f97b881460da9878fe64
2017-11-02 12:19:36 -07:00
Calin Juravle 4dfc22887f Merge "Set the default value of pm.dexopt.shared to speed" am: 1c505a1985
am: 3baa4a6835  -s ours

Change-Id: I64c82a6750b13982d9414333346bfccbccb06367
2017-11-02 18:52:51 +00:00
Calin Juravle 3baa4a6835 Merge "Set the default value of pm.dexopt.shared to speed"
am: 1c505a1985

Change-Id: I22c7e853c7395f085c891f596b7bb73a15467e80
2017-11-02 18:21:54 +00:00
Treehugger Robot 1c505a1985 Merge "Set the default value of pm.dexopt.shared to speed" 2017-11-02 18:13:54 +00:00
Dan Willemsen be48f9de21 Merge "Revert "Add adb keys to debuggable AOSP builds"" am: 40fae9ca0f
am: 438a8b800a

Change-Id: I32ff3e53910b0d162a4aa40ae0111589f979a053
2017-11-02 17:24:48 +00:00