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
Treehugger Robot
7e85dd9dc0
Merge "releasetools: Fix the doctest for rangelib.py."
2017-11-03 00:18:19 +00:00
Jin Qian
c0f4142706
Merge "Always use MKE2FS to build ext4 image" am: dee5abd85a
am: d4fcfea77c
...
am: 511fb3a77d
Change-Id: Ide2c2170b7b51cbd04449b6e0cb9924e7335238d
2017-11-02 21:50:11 +00: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
6f17a1bcfa
Merge "Set the default value of pm.dexopt.shared to speed" am: 1c505a1985
am: 3baa4a6835
-s ours
...
am: 4dfc22887f
-s ours
Change-Id: I0125e70e2779f5251aee0f1237704943efcead60
2017-11-02 19:18:29 +00: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
165ede37ad
Merge "Revert "Add adb keys to debuggable AOSP builds"" am: 40fae9ca0f
am: 438a8b800a
...
am: be48f9de21
Change-Id: I5bc89c0401a9c0535d105ae08cf4cdc62de8241e
2017-11-02 17:26:55 +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
Dan Willemsen
438a8b800a
Merge "Revert "Add adb keys to debuggable AOSP builds""
...
am: 40fae9ca0f
Change-Id: I3003351ba4b043774ada2cb552895865f7e6d30e
2017-11-02 17:20:45 +00:00
Dan Willemsen
40fae9ca0f
Merge "Revert "Add adb keys to debuggable AOSP builds""
2017-11-02 17:16:48 +00:00
Calin Juravle
89836f119e
Set the default value of pm.dexopt.shared to speed
...
By default, we should compile all shared apks with the speed filter.
(cherry picked from commit 3fdb549931
)
Bug: 65591595
Test: build & boot
Merged-In: I8781ca47090321a32641ec4c7a4ed3c722bab475
Change-Id: I8781ca47090321a32641ec4c7a4ed3c722bab475
2017-11-02 09:33:39 -07:00
Tobias Thierer
e76e3837cd
Revert "Add adb keys to debuggable AOSP builds"
...
This reverts commit 6d4536023b
.
Reason for revert: Suspected to have broken build_test on master:
build/make/core/tasks/vendor_module_check.mk:108: error: Error: vendor module "adb_keys" in vendor/google/security/adb in product "aosp_lionhead" being installed to out/multiproduct-20171102103809/aosp_lionhead/target/product/lionhead/root/adb_keys which is not in the vendor tree or odm tree.
Change-Id: If7c1c9f08604b1dfc1036ea6fe3cb487fafc3cf0
2017-11-02 15:16:17 +00:00
Tobias Thierer
349b401136
Merge "Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true" am: 96257655c5
am: 718de33ef9
...
am: f79c5c07a1
Change-Id: I7c74755ba9c7e8a852f19386e1a9a3c93089aa55
2017-11-02 12:50:05 +00:00
Tobias Thierer
f79c5c07a1
Merge "Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true" am: 96257655c5
...
am: 718de33ef9
Change-Id: Ia162ffb7c8415e5573bc68c0c1fbc028e9ac8cdb
2017-11-02 12:46:18 +00:00
Tobias Thierer
718de33ef9
Merge "Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true"
...
am: 96257655c5
Change-Id: I7501eda6c5fcb2c6f495cff71f068c3ec4015413
2017-11-02 12:42:54 +00:00
Tobias Thierer
96257655c5
Merge "Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true"
2017-11-02 12:35:26 +00:00
Steven Moreland
402b4f36b7
Merge "Add HIDL boot-path libs to the PDK." am: 160edc1a90
am: 531fcc2e9d
...
am: a90593f32c
Change-Id: I497f31fa1b0bc2ecd10f129d6b97a2db69e6ce8b
2017-11-02 01:33:10 +00:00
Steven Moreland
a90593f32c
Merge "Add HIDL boot-path libs to the PDK." am: 160edc1a90
...
am: 531fcc2e9d
Change-Id: If55b35ad5af5c943e1a046eb5c7b9cb1e293a1ad
2017-11-02 01:21:31 +00:00
Steven Moreland
531fcc2e9d
Merge "Add HIDL boot-path libs to the PDK."
...
am: 160edc1a90
Change-Id: Icac4297a47282acadb5c71fb1fa62dab27f82671
2017-11-02 01:17:15 +00:00
Treehugger Robot
160edc1a90
Merge "Add HIDL boot-path libs to the PDK."
2017-11-02 01:10:31 +00:00
Dan Willemsen
a2221a5824
Merge "Add adb keys to debuggable AOSP builds" am: 40cd480454
am: ccdbf9866c
...
am: b2830040b4
Change-Id: I944c70d920353bd7f31560566a31c25f58aa6a5b
2017-11-02 01:07:39 +00:00
Dan Willemsen
b2830040b4
Merge "Add adb keys to debuggable AOSP builds" am: 40cd480454
...
am: ccdbf9866c
Change-Id: Ie1c8c729b47cfeb070f899db97b759cbe4b1abd7
2017-11-02 01:03:16 +00:00
Dan Willemsen
ccdbf9866c
Merge "Add adb keys to debuggable AOSP builds"
...
am: 40cd480454
Change-Id: Ib3c254058d07d5e94a998ee2c5b37634ab0b32b6
2017-11-02 00:59:46 +00:00
Treehugger Robot
40cd480454
Merge "Add adb keys to debuggable AOSP builds"
2017-11-02 00:50:22 +00:00
Colin Cross
12a8a5f915
Merge "Pass PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to soong" am: cce2ea423a
am: f14caaec79
...
am: 3e14edb538
Change-Id: I68aaeb4aeb9b028b9c24740dc6df01e02c6f984f
2017-11-02 00:18:53 +00:00
Colin Cross
3e14edb538
Merge "Pass PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to soong" am: cce2ea423a
...
am: f14caaec79
Change-Id: Iad16816e59d96082cece1fb3397581cf4263fb28
2017-11-02 00:15:14 +00:00
Colin Cross
f14caaec79
Merge "Pass PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to soong"
...
am: cce2ea423a
Change-Id: I4584ddd9fc8c8c6c578e761bcff8fddaf22dffde
2017-11-02 00:11:20 +00:00
Colin Cross
cce2ea423a
Merge "Pass PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to soong"
2017-11-02 00:05:20 +00:00
Jin Qian
f0ebe872a2
Always use MKE2FS to build ext4 image
...
Bug: 64395169
Change-Id: I0118fe8ee5f677fdb9da616a11de304b2aefd0ba
2017-11-01 16:37:38 -07:00
Steven Moreland
58dbc79468
Add HIDL boot-path libs to the PDK.
...
Adding:
target/common/obj/JAVA_LIBRARIES/android.hidl.base-V1.0-java_intermediates \
target/common/obj/JAVA_LIBRARIES/android.hidl.base-V1.0-java-static_intermediates \
target/common/obj/JAVA_LIBRARIES/android.hidl.manager-V1.0-java_intermediates \
Ref b/68767391. Currently, Soong java things cannot
build against things in the PDK.
Bug: 68433855
Test: platform.zip contains the 3 added intermediates
Change-Id: I18c556e7f535d9ab8f385b67ae217a2ce2eb8049
2017-11-01 16:27:01 -07:00
Vishwath Mohan
2124699df2
Merge "Revert "Revert "CFI compatibility with static executables and nested archives""" am: fba0a560de
am: 5bff3823c3
...
am: ab24efd988
Change-Id: Id2e729d5df6b048bc3a75da89a2253d8b61aff08
2017-11-01 23:16:54 +00:00
Vishwath Mohan
ab24efd988
Merge "Revert "Revert "CFI compatibility with static executables and nested archives""" am: fba0a560de
...
am: 5bff3823c3
Change-Id: I0c0401c5b89cd4e4a7fa297233a6338231706424
2017-11-01 23:07:20 +00:00
Vishwath Mohan
5bff3823c3
Merge "Revert "Revert "CFI compatibility with static executables and nested archives"""
...
am: fba0a560de
Change-Id: Ib8eb5180a3f6d988f13f7d166a90beeeed302bb4
2017-11-01 22:56:08 +00:00
Treehugger Robot
fba0a560de
Merge "Revert "Revert "CFI compatibility with static executables and nested archives"""
2017-11-01 22:16:00 +00:00
Dan Willemsen
6d4536023b
Add adb keys to debuggable AOSP builds
...
These don't exist on AOSP itself, but if they're added in, debuggable
builds will include the keys. This way automated test farms don't need
manual intervention to authenticate to the device over adb, but we don't
disable security for everyone else.
Bug: 32891559
Test: lunch aosp_marlin-userdebug; m
Change-Id: I59011a5c1f45b0c8bd5c2355d2b4c3671f5da4e4
2017-11-01 15:04:11 -07:00
allenhair
0fe9c494dd
Merge "Fix coverage build." am: e0a367384d
am: c6cfede3fe
...
am: d2bd4d1bcf
Change-Id: I39e98142f5e882afed2190cf53d339cd07b050fc
2017-11-01 17:43:24 +00:00
allenhair
d2bd4d1bcf
Merge "Fix coverage build." am: e0a367384d
...
am: c6cfede3fe
Change-Id: I48f9ee671531c57fd191e84fb8838e5641b0d6f9
2017-11-01 17:37:45 +00:00
allenhair
c6cfede3fe
Merge "Fix coverage build."
...
am: e0a367384d
Change-Id: I638e8be1e8f028475446fa4716cf575e70b91294
2017-11-01 17:34:48 +00:00
allenhair
e0a367384d
Merge "Fix coverage build."
2017-11-01 17:22:16 +00:00
Nicolas Geoffray
1e6a19c714
Merge "Add a product variable for priv-apps dependencies." am: 21a3aef7d7
am: becc7c6c80
...
am: 1361e7d325
Change-Id: I4764c0d1461a292e29f74dc99cf574e1b7e011ac
2017-11-01 13:49:44 +00:00
Nicolas Geoffray
1361e7d325
Merge "Add a product variable for priv-apps dependencies." am: 21a3aef7d7
...
am: becc7c6c80
Change-Id: I23031837174d4ee5e5e9c5a36ffc66ff55b81588
2017-11-01 13:47:36 +00:00
Nicolas Geoffray
becc7c6c80
Merge "Add a product variable for priv-apps dependencies."
...
am: 21a3aef7d7
Change-Id: I956660af26e42e47d5ea0862e6c699b0486803d0
2017-11-01 13:45:30 +00:00
Nicolas Geoffray
21a3aef7d7
Merge "Add a product variable for priv-apps dependencies."
2017-11-01 13:40:20 +00:00