Søren Gjesse
9638eb405b
Merge "Revert "Enable R8 by default (second attempt)"" am: adcd4c761d am: a2e6d78ce6
...
am: db48a0fccc
2017-12-15 15:44:21 +00:00
Søren Gjesse
db48a0fccc
Merge "Revert "Enable R8 by default (second attempt)"" am: adcd4c761d
...
am: a2e6d78ce6
2017-12-15 15:39:16 +00:00
Søren Gjesse
a2e6d78ce6
Merge "Revert "Enable R8 by default (second attempt)""
...
am: adcd4c761d
2017-12-15 15:33:08 +00:00
Søren Gjesse
adcd4c761d
Merge "Revert "Enable R8 by default (second attempt)""
2017-12-15 15:27:16 +00:00
Søren Gjesse
cd13676221
Revert "Enable R8 by default (second attempt)"
...
This reverts commit f2a697725c
2017-12-15 15:18:57 +00:00
Søren Gjesse
46d767cb4b
Merge "Enable R8 by default (second attempt)" am: 837408b4ca am: f692713515
...
am: 529d047513
2017-12-15 11:39:31 +00:00
Søren Gjesse
529d047513
Merge "Enable R8 by default (second attempt)" am: 837408b4ca
...
am: f692713515
2017-12-15 11:15:28 +00:00
Søren Gjesse
f692713515
Merge "Enable R8 by default (second attempt)"
...
am: 837408b4ca
2017-12-15 11:10:26 +00:00
Søren Gjesse
837408b4ca
Merge "Enable R8 by default (second attempt)"
2017-12-15 11:05:25 +00:00
Joe Onorato
8ae7748853
Merge "When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime." into oc-mr1-dev-plus-aosp
...
am: 85dcb56652
2017-12-15 05:44:41 +00:00
TreeHugger Robot
85dcb56652
Merge "When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime." into oc-mr1-dev-plus-aosp
2017-12-15 05:35:56 +00:00
Joe Onorato
3de3a74659
When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime.
...
With LOCAL_PROTO_OPTIMIZE_TYPE set to one of the lite variants, the build system thinks
the proto should be compiled with lite, and will link in the line runtime libs. But if
the .proto files don't contain the directive to compile the source as lite
(option optimize_for = LITE_RUNTIME;), then the generated code will be full and the
libraries will be full, and it won't link.
Test: make
Merged-In: Ib8a135218d62fa42fa6448c49c97f7aeb2755c42
Change-Id: Ib8a135218d62fa42fa6448c49c97f7aeb2755c42
2017-12-14 19:58:43 -08:00
Dan Albert
edd0ce93b1
Merge "Default NDK modules to libc++_shared." am: 587ced4a80 am: 1316e40597
...
am: 9bd305948d
2017-12-15 02:45:44 +00:00
Dan Albert
9bd305948d
Merge "Default NDK modules to libc++_shared." am: 587ced4a80
...
am: 1316e40597
2017-12-15 02:39:12 +00:00
Dan Albert
1316e40597
Merge "Default NDK modules to libc++_shared."
...
am: 587ced4a80
2017-12-15 02:36:34 +00:00
Treehugger Robot
587ced4a80
Merge "Default NDK modules to libc++_shared."
2017-12-15 02:29:58 +00:00
Yifan Hong
43ec6ead28
Rename VINTF XML module names
...
* system_compatibility_matrix/manifest.xml
=> framework_...
* compatibility_matrix/manifest.xml
=> device_...
This is to follow the naming scheme in VINTF
doc.
Test: build all four targets
Change-Id: If5f6a99ded9964f3500c8e5fb97278f8fd0de387
2017-12-14 18:19:44 -08:00
Tao Bao
89d7ab23e8
releasetools: Add common.ZipDelete().
...
We have been shelling out to 'zip -d' to delete existing ZIP entries in
add_img_to_target_files.py. This CL moves the function into common.py,
and calls that for the similar work in ota_from_target_files.py. This CL
also adds unittests for the newly added function.
Test: `m dist`
Test: python -m unittest test_common
Test: ota_from_target_files.py generates identical packages w/ and w/o
the CL (so we know the streaming property computation is intact).
Test: Run 'add_img_to_target_files.py -a' that triggers a call to
ReplaceUpdatedFiles().
Change-Id: Icaa6c3ea3ee2166023f78fa79275295f837ea842
2017-12-14 17:17:04 -08:00
Yifan Hong
ed42caf94d
Move fwk comp mat level logic into assemble_vintf
...
Deprecation schedule requirements is specified in assemble_vintf.
Move all checking logic to assemble_vintf.
Test: builds
Bug: 69636193
Change-Id: I2d62555633494014dc0005931de6c8ae9e6877fa
Merged-In: I2d62555633494014dc0005931de6c8ae9e6877fa
2017-12-14 15:35:15 -08:00
Yifan Hong
97de88c14e
PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE is deprecated.
...
It is replaced by FCM Version specified in the device manifest
directly.
Test: builds
Bug: 69636193
Change-Id: I9e2b871b4c6190107ba9fbb36495bb41c461a0a3
Merged-In: I9e2b871b4c6190107ba9fbb36495bb41c461a0a3
2017-12-14 15:35:15 -08:00
Dan Albert
6168f5baf1
Default NDK modules to libc++_shared.
...
Test: make native
Bug: None
Change-Id: I9ca2313c2082e9841a20e240ffca84219a419d49
2017-12-14 14:45:33 -08:00
Colin Cross
665a0230f2
Merge "Add Soong modules to apkcerts" am: c212517c9b am: f202d3f0c2
...
am: e29acfd7f9
2017-12-14 22:34:19 +00:00
Tao Bao
3491da7bbd
Merge "releasetools: Remove '-w' from ota_from_target_files options." am: 78b5724622 am: 8baa6d4dcd
...
am: 4e71a6caff
2017-12-14 22:33:03 +00:00
Colin Cross
e29acfd7f9
Merge "Add Soong modules to apkcerts" am: c212517c9b
...
am: f202d3f0c2
2017-12-14 22:30:52 +00:00
Tao Bao
4e71a6caff
Merge "releasetools: Remove '-w' from ota_from_target_files options." am: 78b5724622
...
am: 8baa6d4dcd
2017-12-14 22:28:22 +00:00
Colin Cross
f202d3f0c2
Merge "Add Soong modules to apkcerts"
...
am: c212517c9b
2017-12-14 22:26:40 +00:00
Tao Bao
8baa6d4dcd
Merge "releasetools: Remove '-w' from ota_from_target_files options."
...
am: 78b5724622
2017-12-14 22:24:45 +00:00
Colin Cross
c212517c9b
Merge "Add Soong modules to apkcerts"
2017-12-14 22:20:08 +00:00
Treehugger Robot
78b5724622
Merge "releasetools: Remove '-w' from ota_from_target_files options."
2017-12-14 22:18:56 +00:00
Dan Albert
248b832d44
Depend on the more specific ndk timestamp.
...
There are now two NDK sysroot timestamp files: ndk_base which depends
on the headers and stub libraries, and ndk which depends on ndk_base
and the static libraries. For building modules that need the NDK, we
only need to depend on the base sysroot.
Test: make native
Bug: None
Change-Id: I803032eda125a632d780c9cde10f47270491d0d2
2017-12-14 13:52:04 -08:00
Søren Gjesse
f2a697725c
Enable R8 by default (second attempt)
...
Test: m -j PRODUCT-aosp_x86-userdebug
Test: Check that some .vdex files built have R8 generated code
Change-Id: I06903dc30c802bbcffd6992c3c25a1b711a5875c
2017-12-14 22:24:48 +01:00
Colin Cross
aec3640560
Add Soong modules to apkcerts
...
Bug: 70669383
Test: m apkcerts-list contains framework-res
Change-Id: I00c5c5d9e7311bbe4f16bf48407dd0efa242c7aa
2017-12-14 12:29:30 -08:00
Adam Seaton
e5f0ada3ac
[DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev bug:70348883 am: fb5f3b5add am: 9e67329b15 am: e34617a4cc
...
am: c153a4b793
2017-12-14 20:22:00 +00:00
Adam Seaton
c153a4b793
[DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev bug:70348883 am: fb5f3b5add am: 9e67329b15
...
am: e34617a4cc
2017-12-14 20:17:12 +00:00
Adam Seaton
e34617a4cc
[DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev bug:70348883 am: fb5f3b5add
...
am: 9e67329b15
2017-12-14 20:13:44 +00:00
Adam Seaton
9e67329b15
[DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev bug:70348883
...
am: fb5f3b5add
2017-12-14 20:08:30 +00:00
Adam Seaton
fb5f3b5add
[DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev
...
bug:70348883
Change-Id: I3e6a87e66cd2c113d2f8fc0e9572b0a2744a6515
2017-12-14 17:30:59 +00:00
bohu
680ab2effb
emulator: disable location service
...
So that watchdog does not reboot the
system because location service is not
responding.
This is just to get emulator images
booting on aosp.
BUG: 70378659
Change-Id: I81277208e6b9f92bb56c11b072a1f108ea964bb7
Merged-In: I81277208e6b9f92bb56c11b072a1f108ea964bb7
2017-12-14 17:09:18 +00:00
bohu
c8c807062d
emulator: disable location service
...
So that watchdog does not reboot the
system because location service is not
responding.
This is just to get emulator images
booting on aosp.
BUG: 70378659
Change-Id: I81277208e6b9f92bb56c11b072a1f108ea964bb7
2017-12-14 09:08:42 -08:00
Joe Onorato
cd8766b910
Merge "When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime."
2017-12-14 05:33:34 +00:00
Adam Seaton
38f7019b95
Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev am: 3c12119266 am: 07de097829 am: f1a38a2ef0
...
am: 577d9eddc0
2017-12-14 02:46:27 +00:00
Joe Onorato
f2dcd04947
When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime.
...
With LOCAL_PROTO_OPTIMIZE_TYPE set to one of the lite variants, the build system thinks
the proto should be compiled with lite, and will link in the line runtime libs. But if
the .proto files don't contain the directive to compile the source as lite
(option optimize_for = LITE_RUNTIME;), then the generated code will be full and the
libraries will be full, and it won't link.
Test: make
Change-Id: Ib8a135218d62fa42fa6448c49c97f7aeb2755c42
2017-12-13 18:32:31 -08:00
Adam Seaton
577d9eddc0
Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev am: 3c12119266 am: 07de097829
...
am: f1a38a2ef0
2017-12-14 02:21:41 +00:00
Adam Seaton
f1a38a2ef0
Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev am: 3c12119266
...
am: 07de097829
2017-12-14 02:09:34 +00:00
Adam Seaton
07de097829
Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev
...
am: 3c12119266
2017-12-14 01:56:13 +00:00
TreeHugger Robot
3c12119266
Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev
2017-12-14 01:44:56 +00:00
Yifan Hong
86f57bd9f2
Merge changes from topic "fcm_version"
...
* changes:
Move fwk comp mat level logic into assemble_vintf
PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE is deprecated.
2017-12-14 01:26:58 +00:00
Adam Seaton
e84256b6ad
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours am: b22c56332f am: d572ee7efa am: a67af52d8c am: a645938f45 -s ours am: 229da9d2f2 am: 590a4d3c6a am: 81f33be96c am: 6fb0dd12a6 am: 7681838a52 -s ours am: c282e0329a am: 6f9cbc5ff9 am: e0d33135a0
...
am: 24063bc039
2017-12-14 01:00:58 +00:00
Adam Seaton
7f1301d1a3
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f am: 6545915c0b am: 567d926508 am: 06602d3239 -s ours am: 3980822dff am: 5d59b6650b am: ca5b4e7969 am: dc0deb3b47 am: 9b1a2b4f98 -s ours am: 27d97699eb am: fd1ff31fd6 am: 5a16c534d0
...
am: fafc4a9152
2017-12-14 00:59:57 +00:00
Adam Seaton
24063bc039
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours am: b22c56332f am: d572ee7efa am: a67af52d8c am: a645938f45 -s ours am: 229da9d2f2 am: 590a4d3c6a am: 81f33be96c am: 6fb0dd12a6 am: 7681838a52 -s ours am: c282e0329a am: 6f9cbc5ff9
...
am: e0d33135a0
2017-12-14 00:56:12 +00:00
