Dan Willemsen
9f2a63692c
Merge "Allow linking against SystemConfiguration framework on Mac" am: 11545323d2
...
am: f8aaa24575
Change-Id: I6098803167563d41dbdbf51f91f9b9b2ee71d567
2019-02-20 14:44:44 -08:00
Dan Willemsen
f8aaa24575
Merge "Allow linking against SystemConfiguration framework on Mac"
...
am: 11545323d2
Change-Id: I7a5c86886c3db33206683f28016c73b1579da7c9
2019-02-20 13:55:42 -08:00
Jiyong Park
e217f4a37e
Merge "Export make vars using MakeVars method" am: f835ded3c3
...
am: 9118eb3220
Change-Id: I9b3cb1ab47b944ef8cbfe90e0df190769b443f1a
2019-02-20 13:52:15 -08:00
Nicolas Geoffray
57ef108ab5
Merge "Set a dedicated variable for the runtime apex libs." am: 3d186813f2
...
am: 8d3269faca
Change-Id: Iedc96bb236163f0217c97e283d003ee7c7e2b3f8
2019-02-20 13:12:36 -08:00
Treehugger Robot
11545323d2
Merge "Allow linking against SystemConfiguration framework on Mac"
2019-02-20 21:06:11 +00:00
Jiyong Park
9118eb3220
Merge "Export make vars using MakeVars method"
...
am: f835ded3c3
Change-Id: I18bf9a4ad59e368f6f33bc742717d03bbd3b6e38
2019-02-20 12:50:04 -08:00
Nicolas Geoffray
8d3269faca
Merge "Set a dedicated variable for the runtime apex libs."
...
am: 3d186813f2
Change-Id: Id994cd0772f02fd6e5c1819966daeea2663cd162
2019-02-20 12:46:24 -08:00
Yu Shan
c341f40366
Merge "Add 16bit and 32bit nanopb library." am: ecc0efa02a
...
am: 7b7d4dd061
Change-Id: I0f6467d5d0c8f780fbdee4fa3f40a1e764ec118e
2019-02-20 12:22:43 -08:00
Colin Cross
7962a69ff1
Support passing resource zips to aapt2 am: a592e3eae9
...
am: 089d22dec0
Change-Id: I3d368cf2d23fdc6cf0a1120bf64d2eb5b3ccf239
2019-02-20 12:22:15 -08:00
Yu Shan
7b7d4dd061
Merge "Add 16bit and 32bit nanopb library."
...
am: ecc0efa02a
Change-Id: If8d23db1dca013aa4ee90daf6c2fee828e0e1a15
2019-02-20 12:10:14 -08:00
Colin Cross
089d22dec0
Support passing resource zips to aapt2
...
am: a592e3eae9
Change-Id: Ifb2d44b5b00751bef8561448fff2034b42fe5e79
2019-02-20 12:09:52 -08:00
Treehugger Robot
f835ded3c3
Merge "Export make vars using MakeVars method"
2019-02-20 19:24:47 +00:00
Nicolas Geoffray
3d186813f2
Merge "Set a dedicated variable for the runtime apex libs."
2019-02-20 18:42:46 +00:00
Dan Willemsen
97d017ecce
Allow linking against SystemConfiguration framework on Mac
...
This is needed for Python
Test: m py2-cmd; py2-cmd -murllib
Change-Id: I156bd281cb341eba7bdd7e7a15b87e8e90ecee1d
2019-02-20 10:28:56 -08:00
Yu Shan
ecc0efa02a
Merge "Add 16bit and 32bit nanopb library."
2019-02-20 18:23:29 +00:00
Colin Cross
a592e3eae9
Support passing resource zips to aapt2
...
A zip of resources provides an easy way to pass generated resources
to aapt2.
Bug: 74574557
Test: m FrameworksCoreTests
Change-Id: Ie4b1391521a27727694d03e42462b40d775614f8
2019-02-20 18:12:41 +00:00
Xin Li
7754d2747f
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: b81f48ee02
-s ours
...
am: 2937bef649
-s ours
am skip reason: subject contains skip directive
Change-Id: If057f65a8176ba81f2a27f0dc502965b558588b2
2019-02-20 09:57:15 -08:00
Xin Li
2937bef649
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
...
am: b81f48ee02
-s ours
am skip reason: subject contains skip directive
Change-Id: Idbcce9e2deb7fb6557f1bfb31ccfb4b73d1b228e
2019-02-20 09:37:09 -08:00
Xin Li
542d35b68b
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 4e38954d3a
-s ours
...
am: aa2c39b0db
-s ours
am skip reason: subject contains skip directive
Change-Id: I0a5c18e7e1377bd8e3922477aabcb4312d93c3dd
2019-02-20 09:16:45 -08:00
Xin Li
aa2c39b0db
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
...
am: 4e38954d3a
-s ours
am skip reason: subject contains skip directive
Change-Id: I16162b63b4188ae7cbcfefad3b84db8154c75150
2019-02-20 08:38:51 -08:00
Xin Li
b81f48ee02
Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
2019-02-20 16:26:00 +00:00
Dan Albert
856c8234f2
Merge "Revert "Remove armv7-a without neon support"" am: 48db2b15fb
...
am: ecbadc5b6c
Change-Id: Ib59fed4c3f2d6405c64224152e055280fd455f51
2019-02-20 05:27:20 -08:00
Jiyong Park
37eb8bbb3a
Export make vars using MakeVars method
...
ed023eca73
introduced a new (better) way
of exporting make vars from singletone. apex_keys_text singletone is
switched to the new method.
Test: inspect out/soong/make_vars-<target>.mk
Check SOONG_SOONG_APEX_KEYS_FILE is set
Change-Id: Ia218852ba9ae40070cb6c99340d97e0c77d19841
2019-02-20 22:26:21 +09:00
Dan Albert
ecbadc5b6c
Merge "Revert "Remove armv7-a without neon support""
...
am: 48db2b15fb
Change-Id: I3f0bd183bb1dfe36fd9f6221c264c3c26d13e72f
2019-02-20 05:10:09 -08:00
Treehugger Robot
48db2b15fb
Merge "Revert "Remove armv7-a without neon support""
2019-02-20 12:56:37 +00:00
Nicolas Geoffray
39fe574a04
Set a dedicated variable for the runtime apex libs.
...
Bug: 124789867
Test: build with coverage, the boot classpath has jacoco.jar in /system/framework, not the apex
Change-Id: Iaa0762b5a674282be95710d0e1fb166a58ec893b
2019-02-20 10:00:47 +00:00
Anton Hansson
b54ca61c11
Merge "Remove workaround for dupe RRO dirs" am: e0233a5bdd
...
am: 24a4d16048
Change-Id: I5f8bba1f77649391259edad8b59f5e52add65581
2019-02-20 01:22:16 -08:00
Anton Hansson
24a4d16048
Merge "Remove workaround for dupe RRO dirs"
...
am: e0233a5bdd
Change-Id: I26518da7992f59e431e9772cc95277aac1256819
2019-02-20 01:18:13 -08:00
Anton Hansson
e0233a5bdd
Merge "Remove workaround for dupe RRO dirs"
2019-02-20 09:13:50 +00:00
Colin Cross
361874f238
Merge "Allow Singletons to export Make variables" am: 4c317f1cbb
...
am: cd1cbd1f28
Change-Id: Ic0de2f5c468245822f717e9e9a1f1b7d6dba49db
2019-02-20 00:46:10 -08:00
Colin Cross
cd1cbd1f28
Merge "Allow Singletons to export Make variables"
...
am: 4c317f1cbb
Change-Id: I5b8ec3c9175d366220ebfe08231bdf11c1bf9af1
2019-02-20 00:42:06 -08:00
Treehugger Robot
4c317f1cbb
Merge "Allow Singletons to export Make variables"
2019-02-20 08:38:23 +00:00
Sasha Smundak
03144c2be8
Merge "Improve documentation page layout" am: a2b41a6e02
...
am: e12437efa2
Change-Id: I6e669dd18f0d1bab29d163671390be029eac402e
2019-02-20 00:09:58 -08:00
Sasha Smundak
e12437efa2
Merge "Improve documentation page layout"
...
am: a2b41a6e02
Change-Id: If9d1b3d26e18ebb7a121c153b41bd9a78bb713b6
2019-02-20 00:05:56 -08:00
Treehugger Robot
a2b41a6e02
Merge "Improve documentation page layout"
2019-02-20 07:50:16 +00:00
Colin Cross
a01f17a341
Merge changes I7801fc7c,I7d407bd1 am: aa1491fd41
...
am: 22e64a35e2
Change-Id: I05fac09a5bccf3b32bfefe16f5c81cbcf67f2618
2019-02-19 23:25:17 -08:00
Colin Cross
22e64a35e2
Merge changes I7801fc7c,I7d407bd1
...
am: aa1491fd41
Change-Id: I0f5ccef4b23bd857f0cc26d56f9251aa991dc995
2019-02-19 23:21:16 -08:00
Colin Cross
aa1491fd41
Merge changes I7801fc7c,I7d407bd1
...
* changes:
Add CopyOf utility method
Fix a bug in OncePer.Get that could return a waiter
2019-02-20 07:15:17 +00:00
Colin Cross
b36b44d919
Merge "Don't check ABIs in SecondArchIsTranslated" am: 98690957d0
...
am: 84d6594f99
Change-Id: Id5f38beb6a79233f33a2d4efdecc87e0ab7c457c
2019-02-19 22:20:08 -08:00
Colin Cross
84d6594f99
Merge "Don't check ABIs in SecondArchIsTranslated"
...
am: 98690957d0
Change-Id: Id8785e6aea57c6f97695e420e283514f3a39ff4d
2019-02-19 22:15:59 -08:00
Treehugger Robot
98690957d0
Merge "Don't check ABIs in SecondArchIsTranslated"
2019-02-20 06:04:58 +00:00
Pirama Arumuga Nainar
76964af322
Merge "Override module's C flags when coverage is enabled" am: e67c20ce90
...
am: 38bda6ed46
Change-Id: Ib5e6e4d15b1c59dd16ff9f8327824a2110db0ddc
2019-02-19 21:54:57 -08:00
Pirama Arumuga Nainar
38bda6ed46
Merge "Override module's C flags when coverage is enabled"
...
am: e67c20ce90
Change-Id: Ic29108df7012a011f2d4878b57fba10e5accf957
2019-02-19 21:50:55 -08:00
Treehugger Robot
e67c20ce90
Merge "Override module's C flags when coverage is enabled"
2019-02-20 05:40:18 +00:00
Jiyong Park
c915833cd5
Merge "build apexkeys.txt" am: d8ced0f1d9
...
am: db35d040c5
Change-Id: I679025e9abedd6f2d760dc3fe9ca8d17259ccca1
2019-02-19 18:10:40 -08:00
Dan Willemsen
76bd357537
Merge "Use python / python2.7 prebuilts" am: ac0f5d3643
...
am: 29318ab716
Change-Id: I3b3417931097e9e4eb516c27a5f47107a64df76d
2019-02-19 18:09:51 -08:00
Jiyong Park
db35d040c5
Merge "build apexkeys.txt"
...
am: d8ced0f1d9
Change-Id: I3ec80caf8cc90b5fd1312d4660cad732d17da129
2019-02-19 18:07:20 -08:00
Dan Willemsen
29318ab716
Merge "Use python / python2.7 prebuilts"
...
am: ac0f5d3643
Change-Id: I43a7c3a8db6fb57e51343c97a526816116255834
2019-02-19 18:06:25 -08:00
Treehugger Robot
d8ced0f1d9
Merge "build apexkeys.txt"
2019-02-20 01:53:44 +00:00
Dan Willemsen
ac0f5d3643
Merge "Use python / python2.7 prebuilts"
2019-02-20 01:51:06 +00:00