Stephen Hines
c8efc4d5f8
Merge "Remove unnecessary USE_CLANG_PLATFORM_BUILD." am: 504bd79e86
...
am: dfc0111700
Change-Id: I1788117c1661002794f853f06c7d5cfd253f5389
2018-01-12 18:39:38 +00:00
Stephen Hines
dfc0111700
Merge "Remove unnecessary USE_CLANG_PLATFORM_BUILD."
...
am: 504bd79e86
Change-Id: I063e6632b256eb8361cc63251398d30d63a08c58
2018-01-12 18:27:21 +00:00
Stephen Hines
504bd79e86
Merge "Remove unnecessary USE_CLANG_PLATFORM_BUILD."
2018-01-12 18:19:45 +00:00
Elisa Pascual Trevino
650dcd0d5c
Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev am: 48539e0ff6
am: 560b80b913
...
am: b02a234540
Change-Id: If18833bc3c3ca86530c713fbea32f1834566a9ac
2018-01-12 01:55:22 +00:00
Elisa Pascual Trevino
b02a234540
Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev am: 48539e0ff6
...
am: 560b80b913
Change-Id: I3e98e6c0e4c054460a9972cb2caf1149e0713282
2018-01-12 01:49:46 +00:00
Elisa Pascual Trevino
560b80b913
Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev
...
am: 48539e0ff6
Change-Id: I4ee78230426155da8d620bfed6df81b5073e9de5
2018-01-12 01:44:15 +00:00
TreeHugger Robot
48539e0ff6
Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev
2018-01-12 01:33:33 +00:00
Elisa Pascual Trevino
cc4c5a7e21
Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03
am: 4ab30bc502
am: f113fe294c
am: 5a53ba3eb3
am: 82b90c8110
-s ours am: b75e95f40a
am: 8d7856b98a
...
am: ab834f7d14
Change-Id: I85dddc52cc7bced675fbe21728561e3622ea5dcc
2018-01-12 01:25:34 +00:00
Elisa Pascual Trevino
ab834f7d14
Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03
am: 4ab30bc502
am: f113fe294c
am: 5a53ba3eb3
am: 82b90c8110
-s ours am: b75e95f40a
...
am: 8d7856b98a
Change-Id: I3bca6fa5a6da794c9ab670e5d037222c7352a8f5
2018-01-12 01:16:14 +00:00
Elisa Pascual Trevino
8d7856b98a
Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03
am: 4ab30bc502
am: f113fe294c
am: 5a53ba3eb3
am: 82b90c8110
-s ours
...
am: b75e95f40a
Change-Id: I05ea8573430cc94e3c83fdc1eec91971aac9c2dc
2018-01-12 01:01:50 +00:00
Elisa Pascual Trevino
b75e95f40a
Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03
am: 4ab30bc502
am: f113fe294c
am: 5a53ba3eb3
...
am: 82b90c8110
-s ours
Change-Id: I3090e3011e91d75c1f0d99762037b06e9f82e34a
2018-01-12 00:52:46 +00:00
Elisa Pascual Trevino
82b90c8110
Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03
am: 4ab30bc502
am: f113fe294c
...
am: 5a53ba3eb3
Change-Id: I86650749707258d7b440a09f284fc5fcc8e05c32
2018-01-12 00:47:02 +00:00
Elisa Pascual Trevino
5a53ba3eb3
Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03
am: 4ab30bc502
...
am: f113fe294c
Change-Id: I620835e63f499c8e1b8260b5b1414f84d3286eba
2018-01-12 00:40:01 +00:00
Elisa Pascual Trevino
f113fe294c
Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03
...
am: 4ab30bc502
Change-Id: I5c38e422102517f52e0aacfabbf63918cd9de7a5
2018-01-12 00:31:38 +00:00
Elisa Pascual Trevino
4ab30bc502
Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev
...
am: c3aee02b03
Change-Id: I2db4d77ae94e11c304cbbe74557e5c6f42c8a6cd
2018-01-12 00:26:24 +00:00
Elisa Pascual Trevino
70b54f04dc
[DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df
am: a615903311
am: 81e61008ed
am: 51e7d3a175
-s ours am: cd6054fa86
am: 6619c472f3
am: a1c02ac99e
am: 2daf3f586c
am: ba60cad7ab
-s ours am: 587ec653f1
am: fdac6439e4
...
am: 74ba94d143
Change-Id: Ic0c409b86b5bb5d304d8fa8946dde17575f5094e
2018-01-12 00:22:59 +00:00
TreeHugger Robot
c3aee02b03
Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev
2018-01-12 00:19:37 +00:00
Elisa Pascual Trevino
74ba94d143
[DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df
am: a615903311
am: 81e61008ed
am: 51e7d3a175
-s ours am: cd6054fa86
am: 6619c472f3
am: a1c02ac99e
am: 2daf3f586c
am: ba60cad7ab
-s ours am: 587ec653f1
...
am: fdac6439e4
Change-Id: I8af9ec19010e43bb1e8359af152543332f1499f8
2018-01-12 00:17:57 +00:00
Elisa Pascual Trevino
fdac6439e4
[DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df
am: a615903311
am: 81e61008ed
am: 51e7d3a175
-s ours am: cd6054fa86
am: 6619c472f3
am: a1c02ac99e
am: 2daf3f586c
am: ba60cad7ab
-s ours
...
am: 587ec653f1
Change-Id: I9574d7d801ff7804003ba8fe382078abcc8e11ba
2018-01-12 00:14:06 +00:00
Elisa Pascual Trevino
587ec653f1
[DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df
am: a615903311
am: 81e61008ed
am: 51e7d3a175
-s ours am: cd6054fa86
am: 6619c472f3
am: a1c02ac99e
am: 2daf3f586c
...
am: ba60cad7ab
-s ours
Change-Id: I8c98113547529e4db2146eaa682e829ee0ac9fd2
2018-01-12 00:11:34 +00:00
Elisa Pascual Trevino
ba60cad7ab
[DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df
am: a615903311
am: 81e61008ed
am: 51e7d3a175
-s ours am: cd6054fa86
am: 6619c472f3
am: a1c02ac99e
...
am: 2daf3f586c
Change-Id: I35d9356b70e92b50385a879e54576a244574dd1d
2018-01-12 00:09:57 +00:00
Dan Albert
c615ff3f02
Merge "Disable availability macros in libc++ on Darwin." am: ba4641931b
...
am: 38435d2f70
Change-Id: I08b0f641e7a416a162abec6fed7df1cb7d7c228a
2018-01-12 00:07:17 +00:00
Elisa Pascual Trevino
2daf3f586c
[DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df
am: a615903311
am: 81e61008ed
am: 51e7d3a175
-s ours am: cd6054fa86
am: 6619c472f3
...
am: a1c02ac99e
Change-Id: Ic6f9e8e25a106a49986683e8f23f641d0cc749f5
2018-01-12 00:07:13 +00:00
Elisa Pascual Trevino
a1c02ac99e
[DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df
am: a615903311
am: 81e61008ed
am: 51e7d3a175
-s ours am: cd6054fa86
...
am: 6619c472f3
Change-Id: I23f4290b7f7cdbc30ea9b36530421b9a14a50d26
2018-01-12 00:03:48 +00:00
Dan Albert
38435d2f70
Merge "Disable availability macros in libc++ on Darwin."
...
am: ba4641931b
Change-Id: Ie4f17a56b87254e96f938b3f0d6d7c02f20704aa
2018-01-12 00:03:02 +00:00
Elisa Pascual Trevino
6619c472f3
[DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df
am: a615903311
am: 81e61008ed
am: 51e7d3a175
-s ours
...
am: cd6054fa86
Change-Id: I2bfc125bbc7cf0f23c90b82d4b739d66b8de24b8
2018-01-11 23:57:20 +00:00
Elisa Pascual Trevino
cd6054fa86
[DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df
am: a615903311
am: 81e61008ed
...
am: 51e7d3a175
-s ours
Change-Id: Ie369373e406d1bda3c3fe19497b49bcaf2cffccd
2018-01-11 23:54:59 +00:00
Dan Shi
d89ae3b0b9
Merge "Add a flag to disable auto-generating test configs." am: 6704727b69
...
am: d100261cfb
Change-Id: I59be570dacb290ee691de09cbaa89f3dd2c50203
2018-01-11 23:49:43 +00:00
Elisa Pascual Trevino
51e7d3a175
[DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df
am: a615903311
...
am: 81e61008ed
Change-Id: I2822ff9851b4c6981168979ed80e6a8ae5ad255a
2018-01-11 23:49:37 +00:00
Elisa Pascual Trevino
81e61008ed
[DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df
...
am: a615903311
Change-Id: I93a3d87c3410fbf38ce60a6c8d56570c8d75fe9e
2018-01-11 23:47:03 +00:00
Dan Shi
d100261cfb
Merge "Add a flag to disable auto-generating test configs."
...
am: 6704727b69
Change-Id: I58d40a61f24621ca678bc8f83ecbca284ec90fae
2018-01-11 23:46:33 +00:00
Treehugger Robot
ba4641931b
Merge "Disable availability macros in libc++ on Darwin."
2018-01-11 23:44:22 +00:00
Elisa Pascual Trevino
a615903311
[DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241
...
am: fa4234e1df
Change-Id: I73be513192a58a2467ab00ae1b1a4c0c00e9c712
2018-01-11 23:43:31 +00:00
Dan Shi
6704727b69
Merge "Add a flag to disable auto-generating test configs."
2018-01-11 22:59:39 +00:00
Elisa Pascual Trevino
d20489e397
[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev
...
Bug:71860241
2018-01-11 22:58:39 +00:00
Tao Bao
a4b102c012
Merge "releasetools: Remove the fallback-to-full logic." am: 896fa043bc
...
am: c6548f8df4
Change-Id: I339b96181b4887cbc726d2111fd109a086eb5001
2018-01-11 22:54:59 +00:00
Tao Bao
8c7013631b
Merge "releasetools: Remove two dead functions in ota_from_target_files.py." am: 155a140c82
...
am: 11348df23b
Change-Id: I7f941e6ff93e002d27d98b9d6b39384fffae505a
2018-01-11 22:54:11 +00:00
Elisa Pascual Trevino
275847767a
[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev
...
Bug:71860241
2018-01-11 22:51:26 +00:00
Tao Bao
c6548f8df4
Merge "releasetools: Remove the fallback-to-full logic."
...
am: 896fa043bc
Change-Id: I05a02a21a909a7eedf018620be65dfb09e575199
2018-01-11 22:48:59 +00:00
Tao Bao
11348df23b
Merge "releasetools: Remove two dead functions in ota_from_target_files.py."
...
am: 155a140c82
Change-Id: I1a7572a10c713c79ee0c8b8dcad39b69c1de60c6
2018-01-11 22:48:13 +00:00
Elisa Pascual Trevino
fa4234e1df
[DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev
...
Bug:71860241
2018-01-11 22:46:05 +00:00
Stephen Hines
178cf8e4d4
Remove unnecessary USE_CLANG_PLATFORM_BUILD.
...
This build variable is unnecessary now that GCC is completely
unsupported for Android platform builds.
Bug: http://b/64032869
Test: Builds
Change-Id: I9d44ebd7129cb2bdfbb26d37922db19c6fb9efc9
2018-01-11 14:29:23 -08:00
Treehugger Robot
896fa043bc
Merge "releasetools: Remove the fallback-to-full logic."
2018-01-11 22:24:36 +00:00
Treehugger Robot
155a140c82
Merge "releasetools: Remove two dead functions in ota_from_target_files.py."
2018-01-11 22:23:18 +00:00
Dan Albert
9262b6fead
Disable availability macros in libc++ on Darwin.
...
libc++'s headers are annotated with availability macros that indicate
which version of Mac OS was the first to ship with a libc++ feature
available in its *system's* libc++.dylib. We do not use the system's
library, but rather ship our own. As such, these availability
attributes are meaningless for us but cause build breaks when we try
to use code that would not be available in the system's dylib.
Test: removed the darwin check and checked showcommands on linux
Bug: None
Change-Id: I5f69f337baa29fcdf84b5e2fe46bf4f85904d1cd
2018-01-11 13:24:32 -08:00
Yifan Hong
1017eaa38c
Merge "framework_cm.xml: move to hardware/interfaces" am: 1e7ab9db8f
...
am: 32faacadf0
Change-Id: I7f3e2ea415982411c17b7cb87295b6fe70df6365
2018-01-11 19:23:57 +00:00
Dan Shi
2035abfb8d
Add a flag to disable auto-generating test configs.
...
Bug: 71714007
Test: m -j <module for *ts suite>
m -j NotificationStressTests
confirm NotificationStressTests.config generated
Change-Id: I372a227a07633ab8d335a8435baf5dd6081bb27e
2018-01-11 11:22:52 -08:00
Yifan Hong
32faacadf0
Merge "framework_cm.xml: move to hardware/interfaces"
...
am: 1e7ab9db8f
Change-Id: Id0370ec1ac3e10b78363d281dd5019ea8ebf9b34
2018-01-11 19:19:23 +00:00
Yifan Hong
1e7ab9db8f
Merge "framework_cm.xml: move to hardware/interfaces"
2018-01-11 19:14:24 +00:00
Nicolas Geoffray
a66c727b7b
Merge "Remove copy/paste code." am: 08e7159672
...
am: 0cd49dcaf2
Change-Id: I5a8911c30a563f6a49880ae79790e30d1b161c04
2018-01-11 09:26:14 +00:00