OSDN Git Service
Ian Pedowitz [Mon, 6 Jun 2016 17:13:06 +0000 (17:13 +0000)]
NYC is 7.0
am:
7a50757731
* commit '
7a5075773145704fbc08dbb08bd6e859e04e9859':
NYC is 7.0
Change-Id: Ia2d810debba042e21e34c340081369bff970db60
Ian Pedowitz [Wed, 1 Jun 2016 00:36:44 +0000 (17:36 -0700)]
NYC is 7.0
Bug:
29056633
Change-Id: Ib0186c5affd16b5223ba547b2cfff49d830dac1c
Narayan Kamath [Mon, 6 Jun 2016 15:15:01 +0000 (15:15 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev
am:
da147a7c20
* commit '
da147a7c20bf73f9b3736f6c479f3a8f3f56ab9e':
Add default values for pm.dexopt.core-app.
Change-Id: I566fc87539166998340617bbcc7336b5fcc691bc
Narayan Kamath [Mon, 6 Jun 2016 14:48:03 +0000 (14:48 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev
Dan Willemsen [Sat, 4 Jun 2016 01:13:07 +0000 (01:13 +0000)]
Merge "Error on external includes" am:
4b33f51043
am:
d983b78a6f
* commit '
d983b78a6fac17bbfb26d61f28510476f8edb99a':
Error on external includes
Change-Id: I82ba6748ea08cb861e3cf4f0fbade2f277433413
Dan Willemsen [Sat, 4 Jun 2016 01:09:52 +0000 (01:09 +0000)]
Merge "Error on external includes"
am:
4b33f51043
* commit '
4b33f510436f88774f5217b472835973fd8d5b2b':
Error on external includes
Change-Id: Ib2fb1470cee531cb043e7fe4a8e310fb026dcb3c
Dan Willemsen [Sat, 4 Jun 2016 01:03:20 +0000 (01:03 +0000)]
Merge "Error on external includes"
Ian Pedowitz [Fri, 3 Jun 2016 19:26:30 +0000 (19:26 +0000)]
NYC is now REL
am:
f2304ce367
* commit '
f2304ce36778a95793b48fb9ccf83f6b03c19433':
NYC is now REL
Change-Id: I8d8021b1f9cf89f92b147cb29779b6295a5926d1
Ian Pedowitz [Tue, 31 May 2016 22:32:31 +0000 (15:32 -0700)]
NYC is now REL
PLATFORM_VERSION_ALL_CODENAMES needs to include N for now
Bug:
28810934
Bug:
29117805
Change-Id: Ibf44e1e02077e7830d9bf92b87fb8ccae029c121
Chih-Hung Hsieh [Thu, 2 Jun 2016 23:29:55 +0000 (23:29 +0000)]
Merge "Default to enable tidy warnings in header files." am:
6a7cf55a7d
am:
b764f7d0d6
* commit '
b764f7d0d662f7fd9d797ca796a85972596023d6':
Default to enable tidy warnings in header files.
Change-Id: Ied47b955b1e0d11a1711c1d76c7ef90e6394ef5a
Chih-Hung Hsieh [Thu, 2 Jun 2016 23:27:17 +0000 (23:27 +0000)]
Merge "Default to enable tidy warnings in header files."
am:
6a7cf55a7d
* commit '
6a7cf55a7dfe844b4df173520890b4daee60ea63':
Default to enable tidy warnings in header files.
Change-Id: Ib4ca529f2f81d05db8392a4f501bea3400f17d57
Treehugger Robot [Thu, 2 Jun 2016 23:17:59 +0000 (23:17 +0000)]
Merge "Default to enable tidy warnings in header files."
Tao Bao [Thu, 2 Jun 2016 22:56:43 +0000 (22:56 +0000)]
Merge "Add support for TARGET_RECOVERY_BRICK." am:
daf55776be
am:
88df5bee3a
* commit '
88df5bee3addaacddd32adf7f78fd5fe1493c38a':
Add support for TARGET_RECOVERY_BRICK.
Change-Id: I90717df1ee18cadb89bec8afa5280b3ebf434a13
Tao Bao [Thu, 2 Jun 2016 22:54:25 +0000 (22:54 +0000)]
Merge "Add support for TARGET_RECOVERY_BRICK."
am:
daf55776be
* commit '
daf55776beefeb3f59d2f7ca61796ad07fa1d738':
Add support for TARGET_RECOVERY_BRICK.
Change-Id: I70a4682caca250d557975dcf19bfbf63bc567a24
Treehugger Robot [Thu, 2 Jun 2016 22:44:55 +0000 (22:44 +0000)]
Merge "Add support for TARGET_RECOVERY_BRICK."
Chih-Hung Hsieh [Thu, 2 Jun 2016 22:20:05 +0000 (15:20 -0700)]
Default to enable tidy warnings in header files.
Change-Id: I3831f03facbbd6d17117d82f9ccac49bc2645237
Tao Bao [Wed, 1 Jun 2016 06:56:23 +0000 (23:56 -0700)]
Add support for TARGET_RECOVERY_BRICK.
TARGET_RECOVERY_BRICK specifies the file that lists all the partitions
to be bricked under recovery. The file, if present, will be copied to
'$(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.brick'.
Bug:
27253717
Change-Id: Id84195b5ee1031a83bf7a077be070a3728416580
(cherry picked from commit
3051f4f11aef75af1d7cf623506ad6b4b648f3bd)
Narayan Kamath [Thu, 2 Jun 2016 15:34:37 +0000 (16:34 +0100)]
Add default values for pm.dexopt.core-app.
bug:
28998083
Change-Id: Iec4415ad7e5122c1168024f6ccf39b5e342cc7fd
Daniel Micay [Thu, 2 Jun 2016 02:05:17 +0000 (02:05 +0000)]
disable unpriv perf by default in user{,debug} builds
am:
888a623881
* commit '
888a6238810b4c3c00108cb92f9755e74acd9ecf':
disable unpriv perf by default in user{,debug} builds
Change-Id: I79c426595949e10b0eeab7e897be6e5a25060629
Daniel Micay [Tue, 17 May 2016 04:40:52 +0000 (00:40 -0400)]
disable unpriv perf by default in user{,debug} builds
(Cherry picked from commit
fe01f56c0d5c42508e1e82f5976e4c10bb00f632)
Bug:
29054680
Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
Dan Willemsen [Wed, 1 Jun 2016 23:53:44 +0000 (23:53 +0000)]
Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use" am:
476b5b1616
am:
58b7c1c744
* commit '
58b7c1c744aa49fb0686848b281ae75c2485f420':
Add LOCAL_LOGTAGS_FILES that prebuilts can use
Change-Id: I76a6077c3945463a5b52fb8a4f5146a2590de716
Jeffrey Vander Stoep [Wed, 1 Jun 2016 23:53:42 +0000 (23:53 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds" am:
4bc8280a98
am:
13f2b4cf2f
* commit '
13f2b4cf2f9ec4e17bedf75b01263b88d08982d6':
disable unpriv perf by default in user{,debug} builds
Change-Id: Id14069a95cba23aff3540b3a43998cedd52b6ac7
Dan Willemsen [Wed, 1 Jun 2016 23:47:18 +0000 (23:47 +0000)]
Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use"
am:
476b5b1616
* commit '
476b5b161613cc352961414b549a0553361d533b':
Add LOCAL_LOGTAGS_FILES that prebuilts can use
Change-Id: Ib0b5bb5aac8b2d1c9896d58bb2c7928a63de4241
Daniel Micay [Wed, 1 Jun 2016 23:47:15 +0000 (23:47 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds"
am:
4bc8280a98
* commit '
4bc8280a9886d93870fab02eea73986d8ca08965':
disable unpriv perf by default in user{,debug} builds
Change-Id: Icb4e1ad8ec0bd491a99b541ac98dc95bf509aa63
Treehugger Robot [Wed, 1 Jun 2016 23:28:10 +0000 (23:28 +0000)]
Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use"
Jeffrey Vander Stoep [Wed, 1 Jun 2016 23:18:45 +0000 (23:18 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds"
Dan Willemsen [Wed, 1 Jun 2016 22:27:11 +0000 (15:27 -0700)]
Add LOCAL_LOGTAGS_FILES that prebuilts can use
Soong modules can define logtags files that need to be combined into
/system/etc/event-log-tags, so add a new LOCAL_LOGTAGS_FILES variable
that can be used to specify *.logtags file outside of LOCAL_SRC_FILES.
Bug:
28989759
Change-Id: I53c5d396dfb7c6006806758f351eb5cdde90fe74
Colin Cross [Wed, 1 Jun 2016 05:05:34 +0000 (05:05 +0000)]
Merge "Update default NINJA_STATUS to show finished edges" am:
27032630c0
am:
91fbe6006a
* commit '
91fbe6006a1422611e7ec2956d641c18b62f1f4f':
Update default NINJA_STATUS to show finished edges
Change-Id: Iaf65cd8a7fcccdb7e4f06a6708788161885c0dc5
Colin Cross [Wed, 1 Jun 2016 05:05:33 +0000 (05:05 +0000)]
Merge "Update Android.mk finder to work with Android.bp files" am:
520442f053
am:
18023b557b
* commit '
18023b557b6d33836de380df397fce10598931a9':
Update Android.mk finder to work with Android.bp files
Change-Id: I87915d75c3bda9c41c926a7c8ad7c650ac085199
Colin Cross [Wed, 1 Jun 2016 05:01:30 +0000 (05:01 +0000)]
Merge "Update default NINJA_STATUS to show finished edges"
am:
27032630c0
* commit '
27032630c0683c30fa78a7bf9432c5b651707f7b':
Update default NINJA_STATUS to show finished edges
Change-Id: I8e9989722cc5855640a0fcd68597926ce7f0dfda
Colin Cross [Wed, 1 Jun 2016 05:01:28 +0000 (05:01 +0000)]
Merge "Update Android.mk finder to work with Android.bp files"
am:
520442f053
* commit '
520442f0537c72276147e86116a1170ea1ddc9d7':
Update Android.mk finder to work with Android.bp files
Change-Id: Ic737bc2d3e693dc7398fff665f7557c3e2e2a72b
Colin Cross [Wed, 1 Jun 2016 04:52:59 +0000 (04:52 +0000)]
Merge "Update default NINJA_STATUS to show finished edges"
Colin Cross [Wed, 1 Jun 2016 04:52:47 +0000 (04:52 +0000)]
Merge "Update Android.mk finder to work with Android.bp files"
Dan Willemsen [Wed, 1 Jun 2016 02:49:05 +0000 (02:49 +0000)]
Merge "Add Soong tools to PATH" am:
b09e644e1d
am:
28874dc0c1
* commit '
28874dc0c1c790005672406ea50729579096d6f4':
Add Soong tools to PATH
Change-Id: I5a8f9a27a651c1c79469e53daa1cc34a6febbbc8
Dan Willemsen [Wed, 1 Jun 2016 02:45:03 +0000 (02:45 +0000)]
Merge "Add Soong tools to PATH"
am:
b09e644e1d
* commit '
b09e644e1db3439d85ce6dd9e371ac6514a4343c':
Add Soong tools to PATH
Change-Id: I7ba514ee46489e44ff64b5e1be8459567102a33c
Dan Willemsen [Wed, 1 Jun 2016 02:37:18 +0000 (02:37 +0000)]
Merge "Add Soong tools to PATH"
Dan Willemsen [Fri, 27 May 2016 22:15:47 +0000 (15:15 -0700)]
Add Soong tools to PATH
Change-Id: I8f8649106df4ba7cefbfa37a724ebe0635d90b76
Dan Willemsen [Tue, 31 May 2016 22:23:11 +0000 (22:23 +0000)]
Merge "Allow arm prebuilts for x86_arm builds" am:
fcaae6bee8
am:
99e2c216b4
* commit '
99e2c216b42bc2d7cad75f1f3aab432f12678b1d':
Allow arm prebuilts for x86_arm builds
Change-Id: Ife14aedec2f2cae4869f3ed0fb02206bcd29bbb7
Dan Willemsen [Tue, 31 May 2016 22:20:19 +0000 (22:20 +0000)]
Merge "Allow arm prebuilts for x86_arm builds"
am:
fcaae6bee8
* commit '
fcaae6bee83c62703339f0e54751b244ef7fd7b7':
Allow arm prebuilts for x86_arm builds
Change-Id: Ia8a3cd4736afbf7920f4b5383cb24c99a0f9df41
Treehugger Robot [Tue, 31 May 2016 22:08:15 +0000 (22:08 +0000)]
Merge "Allow arm prebuilts for x86_arm builds"
Daniel Micay [Tue, 17 May 2016 04:40:52 +0000 (00:40 -0400)]
disable unpriv perf by default in user{,debug} builds
Bug:
29054680
Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
Dan Willemsen [Tue, 31 May 2016 20:59:38 +0000 (13:59 -0700)]
Allow arm prebuilts for x86_arm builds
But only for static and shared libraries -- we disable building other
types of modules for arm, so don't support the prebuilts for them
either.
This is needed so that we can build these libraries under Soong, and
expose them to Make using BUILD_PREBUILT.
Bug:
27526885
Change-Id: I4f6ec922aed37591b6257b7022b81fb65d05b0fe
Colin Cross [Tue, 31 May 2016 19:38:04 +0000 (12:38 -0700)]
Update default NINJA_STATUS to show finished edges
Update default NINJA_STATUS that includes percentage to match
https://github.com/ninja-build/ninja/commit/
6c2c2eecbfd2e4ddeeacb0129944618a6ce3dc4f
Change-Id: I5694308abe26b71999d944c40962d59d50a73077
Colin Cross [Fri, 27 May 2016 22:23:13 +0000 (15:23 -0700)]
Update Android.mk finder to work with Android.bp files
The Android.mk finder should stop traversing when it finds an Android.bp
file, and any Android.soong.mk file at the same path should be included.
Update filter-soong-makefiles to accept a mixed list of Android.bp files
and Android.mk files, convert Android.bp files to Android.soong.mk files
if they exist, and ignore Android.mk files that have an Android.bp file.
Update first-makefiles-under to use the new --dir syntax for
findleaves.py and search for both Android.bp and Android.mk files.
Update all-makefiles-under and all-named-subdir-makefiles to search for
both Android.bp and Android.mk files.
Change-Id: Iddc51bf84593d5de3add02f2b2c065da08962af4
Lance Chang [Sat, 28 May 2016 18:43:57 +0000 (18:43 +0000)]
Merge "Add build number to apps\' version name for non-platform build" into nyc-dev
am:
1059f37377
* commit '
1059f37377fd37cc311db522b4b5689086480d17':
Add build number to apps' version name for non-platform build
Change-Id: Iad8a4f271db54561d605a3f98f59a62e97eb1614
Lance Jin-woong Chang [Sat, 28 May 2016 18:28:39 +0000 (18:28 +0000)]
Merge "Add build number to apps' version name for non-platform build" into nyc-dev
Colin Cross [Sat, 28 May 2016 01:04:52 +0000 (01:04 +0000)]
Merge "Add --dir option to findleaves.py" am:
40623e2a99
am:
1d7930b2be
* commit '
1d7930b2bedad092189bca3336a9cf717b9b4f37':
Add --dir option to findleaves.py
Change-Id: Id2027d82ae83efd1ca05379b200b7f48ac44b6be
Colin Cross [Sat, 28 May 2016 01:01:43 +0000 (01:01 +0000)]
Merge "Add --dir option to findleaves.py"
am:
40623e2a99
* commit '
40623e2a995247907028b12538a2732ac107a057':
Add --dir option to findleaves.py
Change-Id: I6708e21ca14a5d4e7218c792b6bc6ee0fd6818e8
Treehugger Robot [Sat, 28 May 2016 00:53:47 +0000 (00:53 +0000)]
Merge "Add --dir option to findleaves.py"
Baligh Uddin [Fri, 27 May 2016 23:48:04 +0000 (23:48 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021 am:
5d77e7e0c1 am:
9f527d5222
am:
b4e6eb0e56
* commit '
b4e6eb0e56d125321b7f5ae0141b24f7b0f4e8d7':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: Ia0dbdd270f4ece349a732189f6f944912e498248
Baligh Uddin [Fri, 27 May 2016 23:45:56 +0000 (23:45 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021 am:
5d77e7e0c1
am:
9f527d5222
* commit '
9f527d52229c973fddd94b926b803a6be68ae440':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: Ie7d8b7401ee58ace28a089f97eeb4bc00c43c100
Baligh Uddin [Fri, 27 May 2016 23:42:55 +0000 (23:42 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021
am:
5d77e7e0c1
* commit '
5d77e7e0c1425c8d1ed60dd5425267ce79ef4648':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I6a242bbdf47b588064c94b90f47ffdd5dabef1cc
Baligh Uddin [Fri, 27 May 2016 23:40:04 +0000 (23:40 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours am:
a21a89051e -s ours am:
88582dfa7b -s ours
am:
3200f49a5c -s ours
* commit '
3200f49a5cff8be4ee699e08d97db7e6facd5fb0':
DO NOT MERGE ANYWHERE -
Change-Id: I89da093040461885a861985dddcc169cd675e6c9
Baligh Uddin [Fri, 27 May 2016 23:40:02 +0000 (23:40 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools
am:
e718501021
* commit '
e718501021dd039875745d3ff829341c2bb05248':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I25d3edc76e97f1249768bd9e9bbbecdf8fc5fe79
Baligh Uddin [Fri, 27 May 2016 23:37:47 +0000 (23:37 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours am:
a21a89051e -s ours
am:
88582dfa7b -s ours
* commit '
88582dfa7bb9be8e87b091a7fa705b6669390f8d':
DO NOT MERGE ANYWHERE -
Change-Id: Ia1ead07bfb9a89d85de883ca25c403a7b8d18042
Baligh Uddin [Fri, 27 May 2016 23:34:54 +0000 (23:34 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours
am:
a21a89051e -s ours
* commit '
a21a89051e1b4fdef4aa06f7d17f188d6fbcefe6':
DO NOT MERGE ANYWHERE -
Change-Id: I647de52990f81a5a713f1cdd6064dd4a853144d5
Baligh Uddin [Fri, 27 May 2016 23:32:09 +0000 (23:32 +0000)]
DO NOT MERGE ANYWHERE -
am:
442ae0fe5c -s ours
* commit '
442ae0fe5c76ddabe52e595689a86838820ecbf1':
DO NOT MERGE ANYWHERE -
Change-Id: I5bbd69cd7d85e3b4257d365efe07c38586d45433
Baligh Uddin [Fri, 27 May 2016 23:28:36 +0000 (16:28 -0700)]
Add system/extras/verity/build_verity_metadata.py to otatools
Bug:
29008004
Baligh Uddin [Fri, 27 May 2016 23:19:57 +0000 (23:19 +0000)]
DO NOT MERGE ANYWHERE -
Broke the build in mnc-dr-dev
Revert "Add system/extras/verity/build_verity_metadata.py to otatools"
Bug:
29008004
This reverts commit
d26a99c3c6903c02c5435ec5f0123f057527b0a9.
Change-Id: Ic56a3d382a48a68f6c6f97684c045ec943be1423
Colin Cross [Fri, 27 May 2016 22:20:31 +0000 (15:20 -0700)]
Add --dir option to findleaves.py
findleaves.py needs to be able to search multiple directories for
multiple filenames (Android.bp and Android.mk). Add support for a new
--dir= option to specify one or more directories to search, and then
treat any remaining options as filenames. If no directories are
specified, fall back to treating only the last option as a filename and
the rest as directories.
Change-Id: Ie879facd49192c6b4fafae070ad00eb21b1faa32
Baligh Uddin [Fri, 27 May 2016 22:45:39 +0000 (22:45 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6 am:
1e7c1290c6 am:
b25a7f38a8
am:
b637cb2e99
* commit '
b637cb2e996febbab295b83af8176ec39b864186':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: If3169c81ac00c80dcb3acb45a03af269009c846e
Baligh Uddin [Fri, 27 May 2016 22:43:20 +0000 (22:43 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6 am:
1e7c1290c6
am:
b25a7f38a8
* commit '
b25a7f38a876ee2f9acd90123021401ce73d3aac':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I44dd9e4662d3c4b87545f278f7b22c9535b06356
Baligh Uddin [Fri, 27 May 2016 22:40:22 +0000 (22:40 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6
am:
1e7c1290c6
* commit '
1e7c1290c68263c727d20cdfffa845fea0fdc4b1':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: Ic2f9e99d76369335edc481e6f13316bb99107e8d
Baligh Uddin [Fri, 27 May 2016 22:37:29 +0000 (22:37 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools
am:
d26a99c3c6
* commit '
d26a99c3c6903c02c5435ec5f0123f057527b0a9':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I94f04639338cdb961f3c378b12b8778c89fed232
Baligh Uddin [Fri, 27 May 2016 21:59:48 +0000 (14:59 -0700)]
Add system/extras/verity/build_verity_metadata.py to otatools
Bug:
29008004
Alex Klyubin [Fri, 27 May 2016 20:12:27 +0000 (20:12 +0000)]
Merge "Improve DataSource interface." am:
ce4c9d7108
am:
f41e840250
* commit '
f41e840250e2c0e5cce9263edbcb43fec4163d85':
Improve DataSource interface.
Change-Id: Ibf017a47be707dbd0576021832ce760a7dcaa21a
Alex Klyubin [Fri, 27 May 2016 20:07:42 +0000 (20:07 +0000)]
Merge "Improve DataSource interface."
am:
ce4c9d7108
* commit '
ce4c9d71080d27ce321b1aa49e2189ee55bb25fa':
Improve DataSource interface.
Change-Id: I8a1df06ee64785ae48414b2468e760c41d7f41f3
Alex Klyubin [Fri, 27 May 2016 20:07:40 +0000 (20:07 +0000)]
Merge "Store entry alignment information in APK." am:
85f004c6c5
am:
4ea527597e
* commit '
4ea527597e72ddff825a32fc24c6e4970d50da8f':
Store entry alignment information in APK.
Change-Id: I3ab22f58eba48743a6533265217f09ab007840f6
Alex Klyubin [Fri, 27 May 2016 20:02:10 +0000 (20:02 +0000)]
Merge "Store entry alignment information in APK."
am:
85f004c6c5
* commit '
85f004c6c5995da4f9175eb65b90f48f601d658d':
Store entry alignment information in APK.
Change-Id: I937cd36edbce072bcf329699f2bd3265205a8a11
Alex Klyubin [Fri, 27 May 2016 20:00:59 +0000 (20:00 +0000)]
Merge "Improve DataSource interface."
Alex Klyubin [Fri, 27 May 2016 19:57:11 +0000 (19:57 +0000)]
Merge "Store entry alignment information in APK."
Alex Klyubin [Fri, 27 May 2016 17:00:53 +0000 (10:00 -0700)]
Improve DataSource interface.
1. This adds way to obtain a DataSource which represents a region of
data contained in the DataSource.
2. This fixes a design bug in "feed" method where the size parameter
was an int instead of long.
3. This fixes a bug in ByteBufferDataSource where its mSize field was
a long instead of an int (ByteBuffer's length cannot be more than
2^31).
Bug:
27461702
Change-Id: Ib0812784beb581f19d2412e667b8bd018f0a3c78
Bjoern Johansson [Fri, 27 May 2016 17:24:36 +0000 (17:24 +0000)]
Merge "Remove Dev Settings app from emulator images" into nyc-dev
am:
4f2f58791f
* commit '
4f2f58791f31a66a61865e6c6095a2113609577a':
Remove Dev Settings app from emulator images
Change-Id: Ib7f40046ec64ba08055fec219107b782ebbc1340
Bjoern Johansson [Fri, 27 May 2016 17:19:12 +0000 (17:19 +0000)]
Merge "Remove Dev Settings app from emulator images" into nyc-dev
Colin Cross [Fri, 27 May 2016 00:29:14 +0000 (00:29 +0000)]
Merge "Fix mm and mmm in Android.bp directories" am:
8ed91b6624
am:
323396993c
* commit '
323396993c6651b4b98974df9e9d53118f27a840':
Fix mm and mmm in Android.bp directories
Change-Id: I95d6bde7a0ea72b47779f1a5b0577ff423524b6f
Colin Cross [Fri, 27 May 2016 00:26:30 +0000 (00:26 +0000)]
Merge "Fix mm and mmm in Android.bp directories"
am:
8ed91b6624
* commit '
8ed91b66240d3071a42365737f4cd5c7dbe601e1':
Fix mm and mmm in Android.bp directories
Change-Id: Id8d80175a2ab27c6ea5a969eb37ad12726e68376
Treehugger Robot [Fri, 27 May 2016 00:23:24 +0000 (00:23 +0000)]
Merge "Fix mm and mmm in Android.bp directories"
Dirk Dougherty [Thu, 26 May 2016 23:52:30 +0000 (23:52 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a am:
0f6d425804 am:
53cd365b2d
am:
a5bce98621
* commit '
a5bce98621ef4aa7632ead4de267118f4832d6c2':
Fix improper date reference in blog reader.
Change-Id: Iedec1fc31a923e12a9733427a7ee2666c761b3e5
Dirk Dougherty [Thu, 26 May 2016 23:49:38 +0000 (23:49 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a am:
0f6d425804
am:
53cd365b2d
* commit '
53cd365b2d2c2b074d628147a8a382275075bd1d':
Fix improper date reference in blog reader.
Change-Id: I300892c3c4439354917872839c18e4c029160df1
Dirk Dougherty [Thu, 26 May 2016 23:46:18 +0000 (23:46 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a
am:
0f6d425804
* commit '
0f6d425804d7fd60dc82b9fe0c4ce585aa9e5eed':
Fix improper date reference in blog reader.
Change-Id: I9641b21d8841f2847836c691eba8bfb89497417d
Dirk Dougherty [Thu, 26 May 2016 23:43:35 +0000 (23:43 +0000)]
Fix improper date reference in blog reader.
am:
2732bb762a
* commit '
2732bb762a00828f36bda77c43c7fd14c7495cde':
Fix improper date reference in blog reader.
Change-Id: I5ff0d1d2b16ae712b6e92ef64c023574d2e7bfe5
Colin Cross [Thu, 26 May 2016 22:32:15 +0000 (15:32 -0700)]
Fix mm and mmm in Android.bp directories
mm and mmm were not parsing out/soong/Android.mk, so they were ignoring
all modules defined in an Android.bp file. Always include
out/soong/Android.mk when ONE_SHOT_MAKEFILE is set, and convert the mm
and mmm functions to build MODULES-IN-$DIR instead of all_modules so
that only the subset of modules defined in out/soong/Android.mk for the
requested directory are built.
Bug:
28986194
Change-Id: I6e1ff8cacfc668a4154a0d5937450db840bb7a6b
Dan Willemsen [Thu, 26 May 2016 22:01:20 +0000 (15:01 -0700)]
resolve merge conflicts of
dfcf2e0 to nyc-dev-plus-aosp
Change-Id: I5473ac42db3dba12dffb1d40eb9096d738ef977b
Dan Willemsen [Thu, 26 May 2016 21:52:54 +0000 (21:52 +0000)]
Merge "Remove unnecessary variables"
am:
2eb45d9ab2
* commit '
2eb45d9ab29b0923aeeea51ae0c58e32fea23941':
Remove unnecessary variables
Change-Id: I645c34edb93ce262d245867c4efea2d409366a09
Dan Willemsen [Thu, 26 May 2016 21:49:01 +0000 (21:49 +0000)]
Merge "Remove unnecessary variables"
Dirk Dougherty [Thu, 26 May 2016 20:05:10 +0000 (13:05 -0700)]
Fix improper date reference in blog reader.
Change-Id: I9f1a32a68da2d21ea02b95df8cd7dfc4396a445f
Lance Chang [Thu, 26 May 2016 19:32:30 +0000 (12:32 -0700)]
Add build number to apps' version name for non-platform build
If TARGET_BUILD_WITH_APPS_VERSION_NAME is defined, the build system
will add build number to the apps' default version name.
Bug:
28982976
Change-Id: I536f273b557fe7c935cc4ef1052c3297f8029863
Amanda Kassay [Thu, 26 May 2016 18:36:55 +0000 (18:36 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback." am:
8bac6eb880 am:
0eefec03a7 am:
ecaacf87cd
am:
7bea848abd
* commit '
7bea848abda31862aad104657f87859b7e67677d':
Revert "Updated default.css and docs.js for DoD transition fallback."
Change-Id: If9055f540e174fde5732f36fd47eec0ed2d1f7cb
Amanda Kassay [Thu, 26 May 2016 18:33:54 +0000 (18:33 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback." am:
8bac6eb880 am:
0eefec03a7
am:
ecaacf87cd
* commit '
ecaacf87cd038beb4aad5d6ddc6c1cc1725dca4a':
Revert "Updated default.css and docs.js for DoD transition fallback."
Change-Id: I07e3e36f3dd322fde3067e63a66ac9f5e87e7385
Amanda Kassay [Thu, 26 May 2016 18:28:40 +0000 (18:28 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback." am:
8bac6eb880
am:
0eefec03a7
* commit '
0eefec03a76e5e0201293331dd67baf52dc13ceb':
Revert "Updated default.css and docs.js for DoD transition fallback."
Change-Id: I9dc0292d9615d5cd1f888a4ac92b45b0b3d6ffb4
Amanda Kassay [Thu, 26 May 2016 18:22:56 +0000 (18:22 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback."
am:
8bac6eb880
* commit '
8bac6eb880992e0a4dd37b0f1cf039feebb483ae':
Revert "Updated default.css and docs.js for DoD transition fallback."
Change-Id: I33f169f14f2e7b993e30c00fe59016357242f288
Amanda Kassay [Thu, 26 May 2016 17:58:23 +0000 (17:58 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback."
This reverts commit
4d5bcbf62a0cc6ec1db0c860a818b6166dceed74.
Change-Id: I45dc33a7711f435fd35b51bb0cb44445e6edd918
Dan Willemsen [Tue, 17 May 2016 05:07:31 +0000 (22:07 -0700)]
Remove unnecessary variables
These are all either recently unused due to the removal of CFLAGS/etc,
or have been exported by Soong and are no longer necessary.
Change-Id: I5930d43fda21acc8202b3d8ea010fbefb6ae4cf1
Bjoern Johansson [Thu, 26 May 2016 01:26:14 +0000 (18:26 -0700)]
Remove Dev Settings app from emulator images
The Dev Settings app currently just launches an intent that is received
by the regular Settings app. However, since N the Settings app only
receives the intent when developer mode is enabled. If it is not enabled
the Dev Settings app will crash. Since the Dev Settings app doesn't
really add much benefit this change removes it from the emulator system
images to prevent this issue. The user will have to access the developer
settings from the regular Settings app just like on a physical device.
BUG:
27549126
Change-Id: I8191f9003bb452ef76c4b236b965368b48be3d25
Adam Powell [Thu, 26 May 2016 01:19:57 +0000 (01:19 +0000)]
Merge "N is API 24" into nyc-dev
am:
f211cae2ed
* commit '
f211cae2ede701b58228ff0090bb894f17c0557f':
N is API 24
Change-Id: Id4970239ff53cf27c7d3aa547da383d3f80d2ec9
Colin Cross [Thu, 26 May 2016 01:04:52 +0000 (01:04 +0000)]
Merge "Remove USE_SOONG=false option" am:
5413fb4b3e
am:
a36de73331
* commit '
a36de73331b92e5e75ba92e7a4707e5850e3486d':
Remove USE_SOONG=false option
Change-Id: Iba393dadd32a55e910cf0ab980a1e82887f60bb9
TreeHugger Robot [Thu, 26 May 2016 01:03:06 +0000 (01:03 +0000)]
Merge "N is API 24" into nyc-dev
Colin Cross [Thu, 26 May 2016 00:57:54 +0000 (00:57 +0000)]
Merge "Remove USE_SOONG=false option"
am:
5413fb4b3e
* commit '
5413fb4b3e2310be8568f5024fdc4d0900bf9f9e':
Remove USE_SOONG=false option
Change-Id: I83c44d57917a10838dd9626d382b4e992c58f822
Colin Cross [Thu, 26 May 2016 00:46:39 +0000 (00:46 +0000)]
Merge "Remove USE_SOONG=false option"
Adam Powell [Wed, 25 May 2016 23:48:56 +0000 (16:48 -0700)]
N is API 24
Change-Id: I8e4fbc1d64a6cd3eb0b4765f696ae48170264d52
OSDN Git Service
