Alex Klyubin
56d75bb19d
Merge "Switch signapk to apksigner-core." am: 1a39e8eb34
...
am: 2f24b771ea
* commit '2f24b771eac14924ba9d5ab1a0e69da1641df582':
Switch signapk to apksigner-core.
Change-Id: I3b8ddfcf2369247713b1570cb901cc5604622c75
2016-06-06 19:59:12 +00:00
Alex Klyubin
2f24b771ea
Merge "Switch signapk to apksigner-core."
...
am: 1a39e8eb34
* commit '1a39e8eb3408f45d5f75b261fc073843ab83645b':
Switch signapk to apksigner-core.
Change-Id: I39af8650adfc9ee12f5d6256e4a2083d4f87acfb
2016-06-06 19:52:25 +00:00
Alex Klyubin
1a39e8eb34
Merge "Switch signapk to apksigner-core."
2016-06-06 19:40:23 +00:00
Alex Klyubin
b02eefacbf
Improve efficiency of using the DataSource abstraction.
...
This adds getByteBuffer and copyTo methods to the DataSource
abstraction. These methods enable the client to avoid unnecessary
copying of the data source's data.
Bug: 27461702
Change-Id: If4e9f902ea75c1ca5c7be0e20c0e7218faf9c504
2016-06-06 11:17:03 -07:00
Ian Pedowitz
5131171a2e
Merge "resolve merge conflicts of a87e5f8
to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
2016-06-06 17:32:50 +00:00
Ian Pedowitz
c9d37aba6b
resolve merge conflicts of 7a50757
to nyc-mr1-dev
...
am: 1d2bfb274e
* commit '1d2bfb274e4e62875809aeed632d865e85974b4c':
NYC is 7.0
Change-Id: I2565e7ab290eea462a1e0b32599378a95b7c4f1f
2016-06-06 17:32:32 +00:00
Ian Pedowitz
2c7dc85831
resolve merge conflicts of a87e5f8
to nyc-mr1-dev-plus-aosp
...
Change-Id: I22202dc052ba31f13bd5c6802cb5dfc9bd329ad8
2016-06-06 10:31:58 -07:00
Ian Pedowitz
1d2bfb274e
resolve merge conflicts of 7a50757
to nyc-mr1-dev
...
Change-Id: Ia2ef0a8289d53f9eac47e42336a1fd5f01124a57
2016-06-06 10:27:28 -07:00
Ian Pedowitz
a87e5f85f2
NYC is 7.0
...
am: 7a50757731
* commit '7a5075773145704fbc08dbb08bd6e859e04e9859':
NYC is 7.0
Change-Id: Ia2d810debba042e21e34c340081369bff970db60
2016-06-06 17:13:06 +00:00
Ian Pedowitz
7a50757731
NYC is 7.0
...
Bug: 29056633
Change-Id: Ib0186c5affd16b5223ba547b2cfff49d830dac1c
2016-06-06 17:08:18 +00:00
Ian Pedowitz
5fcdec083e
Removing N from PLATFORM_VERSION_ALL_CODENAMES
...
Change-Id: I328dfa703faf2bd3232f68102d5c7f4b379df030
Fixes: 29117805
2016-06-06 10:06:39 -07:00
Narayan Kamath
d78fa32f2c
Merge "Add default values for pm.dexopt.core-app." into nyc-dev am: da147a7c20
...
am: a5c29e31d4
* commit 'a5c29e31d4cf8a80320e2cb0513bd4941f62eec7':
Change-Id: I76e3221877c1108fc4f2a3dc38de57d22f06a9a0
2016-06-06 15:46:43 +00:00
Narayan Kamath
a5c29e31d4
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: I11b1338f33e7e1bb99341e086bd6bcd7fb5f47f9
2016-06-06 15:23:22 +00:00
Narayan Kamath
753ead8dbe
Merge "Add default values for pm.dexopt.core-app." into nyc-dev am: da147a7c20
...
am: 8b62c008f6
* commit '8b62c008f68ff3576469cd183d4ca821d4d59876':
Add default values for pm.dexopt.core-app.
Change-Id: Iae975aae9b9a3aae8ab2efbe99e0c286eb7fce0c
2016-06-06 15:23:22 +00:00
Narayan Kamath
8b62c008f6
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
2016-06-06 15:15:01 +00:00
Narayan Kamath
da147a7c20
Merge "Add default values for pm.dexopt.core-app." into nyc-dev
2016-06-06 14:48:05 +00:00
Dan Willemsen
ad3bd60374
Merge "Error on external includes" am: 4b33f51043
am: d983b78a6f
...
am: b25374cfe1
* commit 'b25374cfe14fb8d26be5d7b5efad419ec94535e8':
Error on external includes
Change-Id: I4f16b628f88d47083df6bee05e04cc21a6d0701d
2016-06-04 01:14:33 +00:00
Dan Willemsen
b25374cfe1
Merge "Error on external includes" am: 4b33f51043
...
am: d983b78a6f
* commit 'd983b78a6fac17bbfb26d61f28510476f8edb99a':
Error on external includes
Change-Id: I82ba6748ea08cb861e3cf4f0fbade2f277433413
2016-06-04 01:13:07 +00:00
Dan Willemsen
d983b78a6f
Merge "Error on external includes"
...
am: 4b33f51043
* commit '4b33f510436f88774f5217b472835973fd8d5b2b':
Error on external includes
Change-Id: Ib2fb1470cee531cb043e7fe4a8e310fb026dcb3c
2016-06-04 01:09:52 +00:00
Dan Willemsen
4b33f51043
Merge "Error on external includes"
2016-06-04 01:03:20 +00:00
Vikas Marwaha
404ccc83c4
Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the
...
new read only product property ro.product.first_api_level.
PRODUCT_SHIPPING_API_LEVEL declares which API level a device first
shipped with. We use this variable to set a read-only property that
can be used in CTS/GTS tests.
Change-Id: If54202075d3b92ed380655cde8b3fc50c5ba73b3
2016-06-03 23:02:27 +00:00
Ian Pedowitz
dac836a39a
NYC is now REL am: f2304ce367
...
am: 53bf921f72
* commit '53bf921f72fad270964a33007e26a614fa667844':
Change-Id: I3d465ee5a6056159d9486d41911a37cb10e3fbd7
2016-06-03 22:59:03 +00:00
Ian Pedowitz
364e42edae
resolve merge conflicts of f2304ce
to nyc-mr1-dev
...
am: 637c0192fc
* commit '637c0192fcede4e91b4040bf9c486dfe1fb93d74':
NYC is now REL
Change-Id: Id0a79354dedbe45304e7d93f650878c2ba184262
2016-06-03 19:50:41 +00:00
Ian Pedowitz
637c0192fc
resolve merge conflicts of f2304ce
to nyc-mr1-dev
...
Change-Id: I0a2777aaf06ab70a1b0dfe96ff6ba6b165b0101b
2016-06-03 12:33:43 -07:00
Ian Pedowitz
53bf921f72
NYC is now REL
...
am: f2304ce367
* commit 'f2304ce36778a95793b48fb9ccf83f6b03c19433':
NYC is now REL
Change-Id: I8d8021b1f9cf89f92b147cb29779b6295a5926d1
2016-06-03 19:26:30 +00:00
Ian Pedowitz
672cda26d7
Merge "Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""" into nyc-mr1-dev
...
am: 216b1ed2f5
* commit '216b1ed2f515c4b7fb97f17a59660b0a44dcdd71':
Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""
Change-Id: I65bd31fcaf78ad40e3ac42221acfea740207e740
2016-06-03 18:49:24 +00:00
Ian Pedowitz
216b1ed2f5
Merge "Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""" into nyc-mr1-dev
2016-06-03 18:11:03 +00:00
Ian Pedowitz
f2304ce367
NYC is now REL
...
PLATFORM_VERSION_ALL_CODENAMES needs to include N for now
Bug: 28810934
Bug: 29117805
Change-Id: Ibf44e1e02077e7830d9bf92b87fb8ccae029c121
2016-06-03 09:40:41 -07:00
Gustav Sennton
81ee18670d
Add variable PRODUCT_SHIPPING_API_LEVEL.
...
PRODUCT_SHIPPING_API_LEVEL declares which API level a device first
shipped with.
We use this variable to set a read-only property that can be used in
CTS/GTS tests.
Bug: 26381401
Change-Id: I9dfeaf423146c35f57e69ac26c27e8a9e205bc4f
2016-06-03 09:11:34 +00:00
Chih-Hung Hsieh
11aaa7034f
Merge "Default to enable tidy warnings in header files." am: 6a7cf55a7d
am: b764f7d0d6
...
am: fbde37d8b9
* commit 'fbde37d8b9c9422f97cd340bfec8283d3c7114ee':
Default to enable tidy warnings in header files.
Change-Id: Ia6077464eb29f565c79f15a9334a6cb665799ec6
2016-06-02 23:40:55 +00:00
Chih-Hung Hsieh
fbde37d8b9
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
2016-06-02 23:29:55 +00:00
Chih-Hung Hsieh
b764f7d0d6
Merge "Default to enable tidy warnings in header files."
...
am: 6a7cf55a7d
* commit '6a7cf55a7dfe844b4df173520890b4daee60ea63':
Default to enable tidy warnings in header files.
Change-Id: Ib4ca529f2f81d05db8392a4f501bea3400f17d57
2016-06-02 23:27:17 +00:00
Treehugger Robot
6a7cf55a7d
Merge "Default to enable tidy warnings in header files."
2016-06-02 23:18:00 +00:00
Tao Bao
ba22e98c62
Merge "Add support for TARGET_RECOVERY_BRICK." am: daf55776be
am: 88df5bee3a
...
am: 97b55bc7a5
* commit '97b55bc7a5b383892e90409ae35681d4bd98733d':
Add support for TARGET_RECOVERY_BRICK.
Change-Id: Ide62dee71511b4ceb38b5a8fc0d26f78db1fcbf6
2016-06-02 23:00:01 +00:00
Tao Bao
97b55bc7a5
Merge "Add support for TARGET_RECOVERY_BRICK." am: daf55776be
...
am: 88df5bee3a
* commit '88df5bee3addaacddd32adf7f78fd5fe1493c38a':
Add support for TARGET_RECOVERY_BRICK.
Change-Id: I90717df1ee18cadb89bec8afa5280b3ebf434a13
2016-06-02 22:56:43 +00:00
Tao Bao
88df5bee3a
Merge "Add support for TARGET_RECOVERY_BRICK."
...
am: daf55776be
* commit 'daf55776beefeb3f59d2f7ca61796ad07fa1d738':
Add support for TARGET_RECOVERY_BRICK.
Change-Id: I70a4682caca250d557975dcf19bfbf63bc567a24
2016-06-02 22:54:25 +00:00
Treehugger Robot
daf55776be
Merge "Add support for TARGET_RECOVERY_BRICK."
2016-06-02 22:44:56 +00:00
Chih-Hung Hsieh
870f087867
Default to enable tidy warnings in header files.
...
Change-Id: I3831f03facbbd6d17117d82f9ccac49bc2645237
2016-06-02 15:20:05 -07:00
Tao Bao
e3470e1380
Merge "Add support for TARGET_RECOVERY_BRICK." into nyc-mr1-dev
...
am: 6af05e733c
* commit '6af05e733ca0a9e9f33babeb0ef14b3d3bb13376':
Add support for TARGET_RECOVERY_BRICK.
Change-Id: Ib2dfcddbde8f6b918af075b3ed529a1efad1ddf4
2016-06-02 21:51:32 +00:00
Tao Bao
a062c7e62d
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 3051f4f11a
)
2016-06-02 14:46:53 -07:00
Tao Bao
6af05e733c
Merge "Add support for TARGET_RECOVERY_BRICK." into nyc-mr1-dev
2016-06-02 21:46:07 +00:00
Narayan Kamath
41a3b1b413
Add default values for pm.dexopt.core-app.
...
bug: 28998083
Change-Id: Iec4415ad7e5122c1168024f6ccf39b5e342cc7fd
2016-06-02 16:35:03 +01:00
Android Build Merger (Role)
74878e6767
Merge "disable unpriv perf by default in user{,debug} builds am: 888a623881
am: 896a6b878c" into nyc-mr1-dev-plus-aosp
2016-06-02 02:08:30 +00:00
Daniel Micay
27cd4caadb
disable unpriv perf by default in user{,debug} builds am: 888a623881
...
am: 02ab355d1c
* commit '02ab355d1c0b9a1565e08f84b134137f9394bfe5':
disable unpriv perf by default in user{,debug} builds
Change-Id: I56a63bd6502455a15f9271ae99f02279f8e9f90b
2016-06-02 02:07:51 +00:00
Daniel Micay
867ed22da9
disable unpriv perf by default in user{,debug} builds am: 888a623881
...
am: 896a6b878c
* commit '896a6b878cf5078514f86a8c3504a996af128cc6':
disable unpriv perf by default in user{,debug} builds
Change-Id: I397e2e181c8199e015787e32bbceec05b3aa969a
2016-06-02 02:07:51 +00:00
Daniel Micay
896a6b878c
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
2016-06-02 02:05:17 +00:00
Daniel Micay
02ab355d1c
disable unpriv perf by default in user{,debug} builds
...
am: 888a623881
* commit '888a6238810b4c3c00108cb92f9755e74acd9ecf':
disable unpriv perf by default in user{,debug} builds
Change-Id: Ifd28052fe19232461afe26bbde7be42f7f11d9fb
2016-06-02 02:05:15 +00:00
Dan Willemsen
288ad177cf
Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use" am: 476b5b1616
am: 58b7c1c744
...
am: d99f210545
* commit 'd99f210545cba34f0058a74be92f2736d2bd7a00':
Add LOCAL_LOGTAGS_FILES that prebuilts can use
Change-Id: Ib5753e179749212e727253f384d605c9da1506bf
2016-06-02 00:06:08 +00:00
Daniel Micay
522f3abd6b
Merge "disable unpriv perf by default in user{,debug} builds" am: 4bc8280a98
am: 13f2b4cf2f
...
am: 3728ebcfaf
* commit '3728ebcfafccca097e9e87413bda4557ce1fbfd8':
disable unpriv perf by default in user{,debug} builds
Change-Id: I97dcb721eea1a9b2d30126adadd9246987e3ed4a
2016-06-02 00:06:08 +00:00
Daniel Micay
888a623881
disable unpriv perf by default in user{,debug} builds
...
(Cherry picked from commit fe01f56c0d5c42508e1e82f5976e4c10bb00f632)
Bug: 29054680
Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
2016-06-01 17:01:18 -07:00