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
4e71a6caff
Merge "releasetools: Remove '-w' from ota_from_target_files options." am: 78b5724622
...
am: 8baa6d4dcd
2017-12-14 22:28:22 +00:00
8baa6d4dcd
Merge "releasetools: Remove '-w' from ota_from_target_files options."
...
am: 78b5724622
2017-12-14 22:24:45 +00:00
78b5724622
Merge "releasetools: Remove '-w' from ota_from_target_files options."
2017-12-14 22:18:56 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
fafc4a9152
[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
2017-12-14 00:54:34 +00:00
e0d33135a0
[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
2017-12-14 00:51:21 +00:00
5a16c534d0
[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
2017-12-14 00:49:34 +00:00
6f9cbc5ff9
[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
2017-12-14 00:44:57 +00:00
fd1ff31fd6
[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
2017-12-14 00:42:57 +00:00
c282e0329a
[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
2017-12-14 00:38:00 +00:00
27d97699eb
[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
2017-12-14 00:37:20 +00:00
7681838a52
[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
2017-12-14 00:35:14 +00:00
9b1a2b4f98
[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
2017-12-14 00:34:12 +00:00
6fb0dd12a6
[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
2017-12-14 00:31:04 +00:00
dc0deb3b47
[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
2017-12-14 00:29:38 +00:00
81f33be96c
[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
2017-12-14 00:24:09 +00:00
ca5b4e7969
[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
2017-12-14 00:22:42 +00:00
590a4d3c6a
[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
2017-12-14 00:20:38 +00:00
5d59b6650b
[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
2017-12-14 00:19:32 +00:00
229da9d2f2
[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
2017-12-14 00:15:39 +00:00
3980822dff
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f am: 6545915c0b am: 567d926508
...
am: 06602d3239
2017-12-14 00:14:42 +00:00
a645938f45
[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
2017-12-14 00:11:19 +00:00
06602d3239
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f am: 6545915c0b
...
am: 567d926508
2017-12-14 00:10:21 +00:00
a67af52d8c
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours am: b22c56332f
...
am: d572ee7efa
2017-12-14 00:05:26 +00:00
567d926508
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f
...
am: 6545915c0b
2017-12-14 00:03:15 +00:00
d572ee7efa
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours
...
am: b22c56332f
2017-12-13 23:59:29 +00:00
6545915c0b
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883
...
am: 74f105c16f
2017-12-13 23:58:16 +00:00
b22c56332f
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883
...
am: fedac8dbc2
2017-12-13 23:53:49 +00:00
ee2346fa89
[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev
...
bug:70348883
Change-Id: Ib87775083eb064c485a44dffcf3b4630d33d39c5
2017-12-13 23:02:17 +00:00
74f105c16f
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev
...
bug:70348883
2017-12-13 22:53:20 +00:00
fedac8dbc2
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev
...
bug:70348883
2017-12-13 22:52:14 +00:00
e1e61bc501
Merge "emulator: add wifi permission to emulator image"
2017-12-13 21:52:49 +00:00
a7443c3bbb
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
2017-12-13 12:16:17 -08:00
6ce074f2de
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
2017-12-13 12:16:15 -08:00
Tao Bao