Anton Hansson
d4e657a227
Update apidiff.mk to use the sdk-name macro.
...
This internal change complements aosp/661901, which introduced the sdk
module name macro. apidiff.mk doesn't exist in aosp.
Bug: 77525052
Test: make droid
Change-Id: Ia347d8ffef1a7d28508256b4a5c984b3e07ed998
2018-04-17 10:48:15 +01:00
Søren Gjesse
c430f1a24f
Merge "Keep the collected Proguard configuration" am: 0c2a796853
am: a246c6a84a
...
am: 6e65019a45
Change-Id: Icfe84bcc2ebed14179b37f9257ab38ace8cb8b17
2018-04-17 00:17:54 -07:00
Søren Gjesse
6e65019a45
Merge "Keep the collected Proguard configuration" am: 0c2a796853
...
am: a246c6a84a
Change-Id: I2eae581750bdb3fa51649c7b130e3169fa80877f
2018-04-17 00:13:15 -07:00
Søren Gjesse
a246c6a84a
Merge "Keep the collected Proguard configuration"
...
am: 0c2a796853
Change-Id: Icbaef8854a012366cb8cbe9d647065bd85962665
2018-04-17 00:08:36 -07:00
Søren Gjesse
0c2a796853
Merge "Keep the collected Proguard configuration"
2018-04-17 07:01:57 +00:00
Isaac Chen
7d01ca9b9a
Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" into pi-dev am: 6bb69c4c3d
...
am: 3137955323
Change-Id: Ia8b758e361b54991b4074c9c91ea36fd893e6e7b
2018-04-16 22:33:56 -07:00
Isaac Chen
3137955323
Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" into pi-dev
...
am: 6bb69c4c3d
Change-Id: I492a34654f88a2191f23160722461b9cd85af4b0
2018-04-16 22:28:51 -07:00
TreeHugger Robot
6bb69c4c3d
Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" into pi-dev
2018-04-17 05:22:35 +00:00
Dan Willemsen
e2d4795099
[automerger skipped] Merge "Mark version_defaults as readonly" am: eec144223a
am: b288560ae5
-s ours
...
am: cd91406e1d
-s ours
Change-Id: I5201f2d9956219da0b28b7fb3d8d1a6eba87aa17
2018-04-16 20:26:50 -07:00
Dan Willemsen
cd91406e1d
[automerger skipped] Merge "Mark version_defaults as readonly" am: eec144223a
...
am: b288560ae5
-s ours
Change-Id: I95e77051f87f090a01cfdab64ebbe4a7b9899b90
2018-04-16 20:18:13 -07:00
Dan Willemsen
b288560ae5
Merge "Mark version_defaults as readonly"
...
am: eec144223a
Change-Id: Iaf5ba2e0580826c88e0b9872a1130219e955c628
2018-04-16 20:13:37 -07:00
Treehugger Robot
eec144223a
Merge "Mark version_defaults as readonly"
2018-04-17 03:05:22 +00:00
Dan Willemsen
1f1e2e4eea
Mark version_defaults as readonly
...
These shouldn't be changed by anyone after this point, and this will
prevent random Android.mk from re-including this file.
Test: m nothing
Test: failed on hikey w/o https://android-review.googlesource.com/662764
Change-Id: I7ba4db3594af5b18b98fafee81b64531a40df396
Merged-In: I7ba4db3594af5b18b98fafee81b64531a40df396
2018-04-17 01:30:08 +00:00
Nan Zhang
4cd5938725
Merge "Remove make/tools/droiddoc/test/stubs/Android.mk" am: 2fb914c56b
am: 3a966b7247
...
am: e35161cd7c
Change-Id: I5ac50b49e5dd91c956822bba48646f5844a8b8b7
2018-04-16 17:34:28 -07:00
Andrew Hsieh
cc6765d119
Merge "Enable vndk_package if BOARD_VNDK_VERSION is set" into pi-dev am: 0dd11dc0b5
...
am: f88438aa37
Change-Id: Ifd7b7c162af47552a703641c3d5a4a5a67accef5
2018-04-16 17:19:24 -07:00
Andrew Hsieh
67ca80930e
[automerger skipped] Merge "Update current.txt to add libminijail.so" into pi-dev am: 30791d858f
-s ours
...
am: f11f86f08d
-s ours
Change-Id: I3fd261d2b73a9d38da5ca33ddceea74558b20f73
2018-04-16 17:16:51 -07:00
TreeHugger Robot
e87142399e
Merge "Don't use export with BUILD_ID"
2018-04-17 00:07:34 +00:00
Justin Yun
2ce25febf9
[automerger skipped] Update current.txt to add libminijail.so am: 0b2f5279d6
-s ours
...
am: 8f0b582c89
-s ours
Change-Id: I25348e3c7c3d1fc9b22aaa62a83237d042b12673
2018-04-16 16:57:57 -07:00
Justin Yun
4c4ad5ccba
Update the final 28.txt before release. am: 41eb5058bf
...
am: 48db42ff7b
Change-Id: I92739010189299273c37dd0d5007543537558bb7
2018-04-16 16:57:38 -07:00
Nan Zhang
e35161cd7c
Merge "Remove make/tools/droiddoc/test/stubs/Android.mk" am: 2fb914c56b
...
am: 3a966b7247
Change-Id: Ibf7f1edfdaf7dfc112ee119f7e352dd88588aff5
2018-04-16 16:45:52 -07:00
Andrew Hsieh
f88438aa37
Merge "Enable vndk_package if BOARD_VNDK_VERSION is set" into pi-dev
...
am: 0dd11dc0b5
Change-Id: I192316dd07972167e2d5e4a687e15f7f1611f0f8
2018-04-16 16:41:23 -07:00
Nan Zhang
3a966b7247
Merge "Remove make/tools/droiddoc/test/stubs/Android.mk"
...
am: 2fb914c56b
Change-Id: Iae46af9305ae0d765133b30e8b63d0e1e2378be8
2018-04-16 16:40:35 -07:00
Treehugger Robot
2fb914c56b
Merge "Remove make/tools/droiddoc/test/stubs/Android.mk"
2018-04-16 23:30:56 +00:00
Andrew Hsieh
f11f86f08d
[automerger skipped] Merge "Update current.txt to add libminijail.so" into pi-dev
...
am: 30791d858f
-s ours
Change-Id: I3dce1b77e6aa5c8aeba618ae96917a7e8eba1cd9
2018-04-16 16:27:52 -07:00
Justin Yun
8f0b582c89
[automerger skipped] Update current.txt to add libminijail.so
...
am: 0b2f5279d6
-s ours
Change-Id: I7e1f3b98b9efe6895c9c3fa5ce9e9040a28e60a9
2018-04-16 16:13:59 -07:00
Justin Yun
48db42ff7b
Update the final 28.txt before release.
...
am: 41eb5058bf
Change-Id: I9ab82a1d2c7a9a94eca974215cf10e2d9a604e0a
2018-04-16 16:13:33 -07:00
Andrew Hsieh
0dd11dc0b5
Merge "Enable vndk_package if BOARD_VNDK_VERSION is set" into pi-dev
2018-04-16 23:12:19 +00:00
Andrew Hsieh
30791d858f
Merge "Update current.txt to add libminijail.so" into pi-dev
2018-04-16 22:54:58 +00:00
Dan Willemsen
c0d7f6ed8b
Don't use export with BUILD_ID
...
It's not necessary, and all the tools that read this file have been
updated.
Bug: 73959648
Test: cs for uses
Change-Id: Ic203e83ab437beecf07760660f2b3ac7c67e9ded
2018-04-16 15:51:51 -07:00
Andreas Gampe
b873817b9c
Merge "Revert "Build: Support for compiled-classes file"" am: 1cd44482db
am: 7033cc2c6f
...
am: 875a95a494
Change-Id: I20e007bcd81427c8ae1d41358d8bb9e7b2119078
2018-04-16 11:30:01 -07:00
Andreas Gampe
875a95a494
Merge "Revert "Build: Support for compiled-classes file"" am: 1cd44482db
...
am: 7033cc2c6f
Change-Id: I83a5d50c39dc0c83f133121f0680d99388e17daa
2018-04-16 11:17:24 -07:00
Andreas Gampe
7033cc2c6f
Merge "Revert "Build: Support for compiled-classes file""
...
am: 1cd44482db
Change-Id: I93c46ba84df49662ed161134f9b8b9ce406f8ac1
2018-04-16 11:07:26 -07:00
Wale Ogunwale
f18db3fac8
Merge "Finalizing P SDK"
2018-04-16 17:31:08 +00:00
Treehugger Robot
1cd44482db
Merge "Revert "Build: Support for compiled-classes file""
2018-04-16 16:33:24 +00:00
Søren Gjesse
9fbdd9ec5a
Keep the collected Proguard configuration
...
This will work for both R8 and Proguard
Test: m -j Settings && "manually check .../proguard_coniguration file"
Change-Id: I1da7c3426b3511e2d5ad69852da8cec3245d7e54
2018-04-16 09:16:35 +02:00
Justin Yun
41eb5058bf
Update the final 28.txt before release.
...
Add libminijail.so to VNDK list.
Bug: 63866913
Test: Build sailfish and libminijail.so should be installed into
/system/lib[64]/vndk/libminijail.so instead of
/vendor/lib[64]/libminijail.so.
Change-Id: I611598f0fc700dcee7829badb975479803c8b7ad
2018-04-16 06:52:54 +00:00
Chih-Hung Hsieh
252212588a
Merge "Fix typo." am: 5576f9a6ca
am: ffcdc18a8c
...
am: 3dd4d3ebbc
Change-Id: I119a50bd4cd8ae4cec06dbc16cc797164454c860
2018-04-14 16:48:00 -07:00
Dan Willemsen
34bfe98793
Merge "Mark version_defaults as readonly" into pi-dev-plus-aosp
...
am: 18fbe81b9f
Change-Id: Iee2389fff9e3c0fbb5d15b34ab599610783fc6c6
2018-04-14 16:34:40 -07:00
Chih-Hung Hsieh
3dd4d3ebbc
Merge "Fix typo." am: 5576f9a6ca
...
am: ffcdc18a8c
Change-Id: I1c107e3e18602da8dfbb8ca48426252e86161db5
2018-04-14 16:06:14 -07:00
Wale Ogunwale
e1ffab919f
Merge "Freeze VNDK list for finalizing P SDK" into pi-dev am: 03b6fa6a64
...
am: 4079cd2259
Change-Id: I5610fab13ebc2238b0c36b301ab8be837c52a008
2018-04-14 15:58:47 -07:00
Wale Ogunwale
e1013e3c9b
[automerger skipped] Merge "Finalizing P SDK" into pi-dev am: 5de065e3ec
...
am: 040ba07736
-s ours
Change-Id: I3e88d0d828e8805e750cb1f613aac25af5cebbc4
2018-04-14 15:58:15 -07:00
Chih-Hung Hsieh
ffcdc18a8c
Merge "Fix typo."
...
am: 5576f9a6ca
Change-Id: I1ed90064bdf8521f5049c21e244e101f27d8521e
2018-04-14 15:58:11 -07:00
Justin Yun
0b2f5279d6
Update current.txt to add libminijail.so
...
Add libminijail.so to VNDK list.
Bug: 63866913
Test: Build sailfish and libminijail.so should be installed into
/system/lib[64]/vndk/libminijail.so instead of
/vendor/lib[64]/libminijail.so.
Change-Id: Iaddfc4f4810458e5061841a9c4b99eb6052934c7
Merged-In: Ie90111c10781cc366faa711027f279601709fe56
2018-04-14 05:17:19 +00:00
Treehugger Robot
5576f9a6ca
Merge "Fix typo."
2018-04-13 21:53:02 +00:00
TreeHugger Robot
18fbe81b9f
Merge "Mark version_defaults as readonly" into pi-dev-plus-aosp
2018-04-13 21:39:43 +00:00
Wale Ogunwale
4079cd2259
Merge "Freeze VNDK list for finalizing P SDK" into pi-dev
...
am: 03b6fa6a64
Change-Id: Id729269a0e333a3b6ed5ed32ca4735f8ebbbfaf3
2018-04-13 14:07:13 -07:00
Wale Ogunwale
040ba07736
Merge "Finalizing P SDK" into pi-dev
...
am: 5de065e3ec
Change-Id: I552ebda180de398512b91addde17d8d48ec60624
2018-04-13 14:06:43 -07:00
Ruchi Kandoi
907ed0a3bd
Merge "Adds SecureElement apk to core.mk" into pi-dev am: 08afb09c5c
...
am: 85bc17b549
Change-Id: Id4ca35331473cd0732c0c4157262b7e67c41c5aa
2018-04-13 13:56:50 -07:00
Wale Ogunwale
03b6fa6a64
Merge "Freeze VNDK list for finalizing P SDK" into pi-dev
2018-04-13 20:53:03 +00:00
Wale Ogunwale
5de065e3ec
Merge "Finalizing P SDK" into pi-dev
2018-04-13 20:53:03 +00:00