OSDN Git Service
Android Build Merger (Role) [Tue, 7 Jun 2016 16:35:29 +0000 (16:35 +0000)]
Merge "Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev am:
837b86aa56 am:
61e811370d" into nyc-mr1-dev-plus-aosp
Gustav Sennton [Tue, 7 Jun 2016 16:35:18 +0000 (16:35 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev am:
837b86aa56
am:
1a37df5ea1
* commit '
1a37df5ea175033469165f46e2732f8ec9bb5537':
Add variable PRODUCT_SHIPPING_API_LEVEL.
Change-Id: I36d226ff72d1c9a5e340a707ed939358f5c21f33
Gustav Sennton [Tue, 7 Jun 2016 16:35:18 +0000 (16:35 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev am:
837b86aa56
am:
61e811370d
* commit '
61e811370dec47396ff4c0732f19b30cf1f88605':
Add variable PRODUCT_SHIPPING_API_LEVEL.
Change-Id: Ic662a8e1a6395199b2b52d170af825625ebd148f
Gustav Sennton [Tue, 7 Jun 2016 16:32:33 +0000 (16:32 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
am:
837b86aa56
* commit '
837b86aa5696fea28a0acfde7361a3c5d5824624':
Add variable PRODUCT_SHIPPING_API_LEVEL.
Change-Id: I692a44938baa8e462041786b1f394dc5b41ac8e0
Gustav Sennton [Tue, 7 Jun 2016 16:32:33 +0000 (16:32 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
am:
837b86aa56
* commit '
837b86aa5696fea28a0acfde7361a3c5d5824624':
Add variable PRODUCT_SHIPPING_API_LEVEL.
Change-Id: I8beb5632ed9db8cade04bf8792b5874f761c039e
Gustav Sennton [Tue, 7 Jun 2016 16:21:15 +0000 (16:21 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
Dan Willemsen [Tue, 7 Jun 2016 00:12:16 +0000 (00:12 +0000)]
Merge "Add NATIVE_TESTS class, move host native tests" am:
e72fc63901 am:
10461b78f0
am:
32b36a8819
* commit '
32b36a88198b9e9f44c22d9103d67530ab0d8940':
Add NATIVE_TESTS class, move host native tests
Change-Id: I846592e2c77fa7823d2635f61168b11c51433bfb
Dan Willemsen [Tue, 7 Jun 2016 00:09:39 +0000 (00:09 +0000)]
Merge "Add NATIVE_TESTS class, move host native tests" am:
e72fc63901
am:
10461b78f0
* commit '
10461b78f0955d9dba8d32045d1e35ff0f9a5c8c':
Add NATIVE_TESTS class, move host native tests
Change-Id: Ia11b54676d3b33e58c177a5a375f29233657524e
Dan Willemsen [Tue, 7 Jun 2016 00:05:35 +0000 (00:05 +0000)]
Merge "Add NATIVE_TESTS class, move host native tests"
am:
e72fc63901
* commit '
e72fc639014809b4d4239d7f7754c6950f1ad546':
Add NATIVE_TESTS class, move host native tests
Change-Id: Ifb0401242afe1e6e16666001faf3d55471200c3f
Dan Willemsen [Mon, 6 Jun 2016 23:59:23 +0000 (23:59 +0000)]
Merge "Add NATIVE_TESTS class, move host native tests"
Dan Willemsen [Mon, 6 Jun 2016 23:06:22 +0000 (23:06 +0000)]
Merge "Switch some build tools to Soong" am:
c52d09e694 am:
8a78c90a95
am:
6fe82857b5
* commit '
6fe82857b51db783a0a8c5ca48cca02ac53c9da7':
Switch some build tools to Soong
Change-Id: Ibe38c84ff0e0be64a35a8b25f07881c8ac699f33
Dan Willemsen [Mon, 6 Jun 2016 23:05:06 +0000 (23:05 +0000)]
Merge "Switch some build tools to Soong" am:
c52d09e694
am:
8a78c90a95
* commit '
8a78c90a95a3a0c5886b333e90994721eeb92734':
Switch some build tools to Soong
Change-Id: I481784785375dfb6790d14681eb110e0f67bf65c
Dan Willemsen [Mon, 6 Jun 2016 22:58:28 +0000 (22:58 +0000)]
Merge "Switch some build tools to Soong"
am:
c52d09e694
* commit '
c52d09e6944e531e02242cf971020cb2c0cf9844':
Switch some build tools to Soong
Change-Id: I4ba945cad1eda7c696cd770243e226a09ff735ac
Treehugger Robot [Mon, 6 Jun 2016 22:51:56 +0000 (22:51 +0000)]
Merge "Switch some build tools to Soong"
Dan Willemsen [Mon, 6 Jun 2016 21:41:32 +0000 (14:41 -0700)]
Switch some build tools to Soong
In preparation for including them in prebuilts/build-tools.
acp: We use a prebuilt in prebuilts/sdk, but it's not part of the sdk.
ijar: We use the host libstdc++ to workaround the lack of libc++ on
some unbundled branches.
ziptime: We disable this on unbundled builds, due to the lack of libc++.
Change-Id: Ib9766b1dbddd151c38ff27c529865200ab37fce1
Dan Willemsen [Mon, 6 Jun 2016 21:44:37 +0000 (21:44 +0000)]
Merge "Remove dead rgb2565" am:
a571e83095 am:
d1f0eb15c8
am:
029da90bf4
* commit '
029da90bf41604c97ccf9806f1dcf49d9cd9982c':
Remove dead rgb2565
Change-Id: Ieca7e7d6532de17c909a5a39ea44d1c665af934b
Dan Willemsen [Mon, 6 Jun 2016 21:43:16 +0000 (21:43 +0000)]
Merge "Remove dead rgb2565" am:
a571e83095
am:
d1f0eb15c8
* commit '
d1f0eb15c812b8c4ea8697b9e2171846e6510884':
Remove dead rgb2565
Change-Id: I6a95c5cf31a05822d85fce16d1e9b311dd759cee
Dan Willemsen [Mon, 6 Jun 2016 21:39:48 +0000 (21:39 +0000)]
Merge "Remove dead rgb2565"
am:
a571e83095
* commit '
a571e83095a72d595e5e4e365e0ae52aefd64356':
Remove dead rgb2565
Change-Id: I6dae3bbd804591a0e91f3467f021c5ee2dde4bf7
Treehugger Robot [Mon, 6 Jun 2016 21:35:47 +0000 (21:35 +0000)]
Merge "Remove dead rgb2565"
Dan Willemsen [Mon, 6 Jun 2016 21:34:44 +0000 (21:34 +0000)]
Merge "Drop CLANG and CLANG_CXX in the environment" am:
27a55cd3c7 am:
f03398b651
am:
ecf97649bd
* commit '
ecf97649bd4ae5b2f1084874d9e809b73d9b4095':
Drop CLANG and CLANG_CXX in the environment
Change-Id: I543ce82c8d6260724551c2b51aa7ae0aeb19c3d5
Dan Willemsen [Mon, 6 Jun 2016 21:33:07 +0000 (21:33 +0000)]
Merge "Drop CLANG and CLANG_CXX in the environment" am:
27a55cd3c7
am:
f03398b651
* commit '
f03398b6519e1d9695c61da450346d5a0f0f8528':
Drop CLANG and CLANG_CXX in the environment
Change-Id: I9fce3d3c203b89295529c72de4d094ff62d178fd
Dan Willemsen [Mon, 6 Jun 2016 21:27:10 +0000 (21:27 +0000)]
Merge "Drop CLANG and CLANG_CXX in the environment"
am:
27a55cd3c7
* commit '
27a55cd3c703c190f933630e503d963ef7478183':
Drop CLANG and CLANG_CXX in the environment
Change-Id: I3850b1783fb47cda05f1a7799ff8ceddb589e033
Alex Klyubin [Mon, 6 Jun 2016 21:24:37 +0000 (21:24 +0000)]
Merge "Improve efficiency of using the DataSource abstraction." am:
7353eabd14 am:
732b29a5c3
am:
31e3dab7bb
* commit '
31e3dab7bb7dd447c1043a671668d4a3987daded':
Improve efficiency of using the DataSource abstraction.
Change-Id: I4e3719cf4283b2fa93009e68394071b0a6ce6f45
Alex Klyubin [Mon, 6 Jun 2016 21:23:05 +0000 (21:23 +0000)]
Merge "Improve efficiency of using the DataSource abstraction." am:
7353eabd14
am:
732b29a5c3
* commit '
732b29a5c38a3a33bdffea662875e6a8dab894b3':
Improve efficiency of using the DataSource abstraction.
Change-Id: I4b2e05ffc80d59ef19a1b78c3560f0d21c5b04b2
Treehugger Robot [Mon, 6 Jun 2016 21:22:57 +0000 (21:22 +0000)]
Merge "Drop CLANG and CLANG_CXX in the environment"
Alex Klyubin [Mon, 6 Jun 2016 21:17:02 +0000 (21:17 +0000)]
Merge "Improve efficiency of using the DataSource abstraction."
am:
7353eabd14
* commit '
7353eabd14cbfae2c123a58cae4ce1e770ee351d':
Improve efficiency of using the DataSource abstraction.
Change-Id: Ia1ab6c7d0b94c59ab6d7b41828e8e5d676c212e5
Alex Klyubin [Mon, 6 Jun 2016 21:07:52 +0000 (21:07 +0000)]
Merge "Improve efficiency of using the DataSource abstraction."
Dan Willemsen [Mon, 6 Jun 2016 20:32:11 +0000 (13:32 -0700)]
Remove dead rgb2565
Change-Id: I2397dc97768f24a7c416bff96dd983fc796cbb53
Dan Willemsen [Mon, 6 Jun 2016 19:21:06 +0000 (12:21 -0700)]
Drop CLANG and CLANG_CXX in the environment
We'll explicitly pass these variables to the static analyzer builds in
binary.mk
Bug:
29071982
Change-Id: Ifc7633d36f5785fe16b63f54b885396c2cab542a
Alex Klyubin [Mon, 6 Jun 2016 20:00:21 +0000 (20:00 +0000)]
Merge "Switch signapk to apksigner-core." am:
1a39e8eb34 am:
2f24b771ea
am:
56d75bb19d
* commit '
56d75bb19d19fdc5001152d9bcd71eca01f84de6':
Switch signapk to apksigner-core.
Change-Id: Ib3b5e21aa2c45e96871b4778583aa6484594fd10
Alex Klyubin [Mon, 6 Jun 2016 19:59:12 +0000 (19:59 +0000)]
Merge "Switch signapk to apksigner-core." am:
1a39e8eb34
am:
2f24b771ea
* commit '
2f24b771eac14924ba9d5ab1a0e69da1641df582':
Switch signapk to apksigner-core.
Change-Id: I3b8ddfcf2369247713b1570cb901cc5604622c75
Alex Klyubin [Mon, 6 Jun 2016 19:52:25 +0000 (19:52 +0000)]
Merge "Switch signapk to apksigner-core."
am:
1a39e8eb34
* commit '
1a39e8eb3408f45d5f75b261fc073843ab83645b':
Switch signapk to apksigner-core.
Change-Id: I39af8650adfc9ee12f5d6256e4a2083d4f87acfb
Alex Klyubin [Mon, 6 Jun 2016 19:40:23 +0000 (19:40 +0000)]
Merge "Switch signapk to apksigner-core."
Alex Klyubin [Mon, 6 Jun 2016 18:12:50 +0000 (11:12 -0700)]
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
Ian Pedowitz [Mon, 6 Jun 2016 17:32:49 +0000 (17:32 +0000)]
Merge "resolve merge conflicts of
a87e5f8 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
Ian Pedowitz [Mon, 6 Jun 2016 17:32:32 +0000 (17:32 +0000)]
resolve merge conflicts of
7a50757 to nyc-mr1-dev
am:
1d2bfb274e
* commit '
1d2bfb274e4e62875809aeed632d865e85974b4c':
NYC is 7.0
Change-Id: I2565e7ab290eea462a1e0b32599378a95b7c4f1f
Ian Pedowitz [Mon, 6 Jun 2016 17:31:58 +0000 (10:31 -0700)]
resolve merge conflicts of
a87e5f8 to nyc-mr1-dev-plus-aosp
Change-Id: I22202dc052ba31f13bd5c6802cb5dfc9bd329ad8
Ian Pedowitz [Mon, 6 Jun 2016 17:27:28 +0000 (10:27 -0700)]
resolve merge conflicts of
7a50757 to nyc-mr1-dev
Change-Id: Ia2ef0a8289d53f9eac47e42336a1fd5f01124a57
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:46:43 +0000 (15:46 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev am:
da147a7c20
am:
a5c29e31d4
* commit '
a5c29e31d4cf8a80320e2cb0513bd4941f62eec7':
Change-Id: I76e3221877c1108fc4f2a3dc38de57d22f06a9a0
Narayan Kamath [Mon, 6 Jun 2016 15:23:22 +0000 (15:23 +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: I11b1338f33e7e1bb99341e086bd6bcd7fb5f47f9
Narayan Kamath [Mon, 6 Jun 2016 15:23:22 +0000 (15:23 +0000)]
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
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:14:33 +0000 (01:14 +0000)]
Merge "Error on external includes" am:
4b33f51043 am:
d983b78a6f
am:
b25374cfe1
* commit '
b25374cfe14fb8d26be5d7b5efad419ec94535e8':
Error on external includes
Change-Id: I4f16b628f88d47083df6bee05e04cc21a6d0701d
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 22:59:03 +0000 (22:59 +0000)]
NYC is now REL am:
f2304ce367
am:
53bf921f72
* commit '
53bf921f72fad270964a33007e26a614fa667844':
Change-Id: I3d465ee5a6056159d9486d41911a37cb10e3fbd7
Ian Pedowitz [Fri, 3 Jun 2016 19:50:41 +0000 (19:50 +0000)]
resolve merge conflicts of
f2304ce to nyc-mr1-dev
am:
637c0192fc
* commit '
637c0192fcede4e91b4040bf9c486dfe1fb93d74':
NYC is now REL
Change-Id: Id0a79354dedbe45304e7d93f650878c2ba184262
Ian Pedowitz [Fri, 3 Jun 2016 19:33:43 +0000 (12:33 -0700)]
resolve merge conflicts of
f2304ce to nyc-mr1-dev
Change-Id: I0a2777aaf06ab70a1b0dfe96ff6ba6b165b0101b
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 [Fri, 3 Jun 2016 18:49:24 +0000 (18:49 +0000)]
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
Ian Pedowitz [Fri, 3 Jun 2016 18:11:03 +0000 (18:11 +0000)]
Merge "Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""" into nyc-mr1-dev
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
Gustav Sennton [Fri, 27 May 2016 13:07:54 +0000 (14:07 +0100)]
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
Chih-Hung Hsieh [Thu, 2 Jun 2016 23:40:55 +0000 (23:40 +0000)]
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
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 23:00:01 +0000 (23:00 +0000)]
Merge "Add support for TARGET_RECOVERY_BRICK." am:
daf55776be am:
88df5bee3a
am:
97b55bc7a5
* commit '
97b55bc7a5b383892e90409ae35681d4bd98733d':
Add support for TARGET_RECOVERY_BRICK.
Change-Id: Ide62dee71511b4ceb38b5a8fc0d26f78db1fcbf6
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 [Thu, 2 Jun 2016 21:51:32 +0000 (21:51 +0000)]
Merge "Add support for TARGET_RECOVERY_BRICK." into nyc-mr1-dev
am:
6af05e733c
* commit '
6af05e733ca0a9e9f33babeb0ef14b3d3bb13376':
Add support for TARGET_RECOVERY_BRICK.
Change-Id: Ib2dfcddbde8f6b918af075b3ed529a1efad1ddf4
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)
Tao Bao [Thu, 2 Jun 2016 21:46:07 +0000 (21:46 +0000)]
Merge "Add support for TARGET_RECOVERY_BRICK." into nyc-mr1-dev
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
Android Build Merger (Role) [Thu, 2 Jun 2016 02:08:30 +0000 (02:08 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds am:
888a623881 am:
896a6b878c" into nyc-mr1-dev-plus-aosp
Daniel Micay [Thu, 2 Jun 2016 02:07:51 +0000 (02:07 +0000)]
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
Daniel Micay [Thu, 2 Jun 2016 02:07:51 +0000 (02:07 +0000)]
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
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 [Thu, 2 Jun 2016 02:05:15 +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: Ifd28052fe19232461afe26bbde7be42f7f11d9fb
Dan Willemsen [Thu, 2 Jun 2016 00:06:08 +0000 (00:06 +0000)]
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
Daniel Micay [Thu, 2 Jun 2016 00:06:08 +0000 (00:06 +0000)]
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
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
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
Colin Cross [Wed, 1 Jun 2016 05:09:38 +0000 (05:09 +0000)]
Merge "Update default NINJA_STATUS to show finished edges" am:
27032630c0 am:
91fbe6006a
am:
2a73e9280b
* commit '
2a73e9280b9d38f2eefb4e762ba90488323cb2e4':
Update default NINJA_STATUS to show finished edges
Change-Id: Ibb8c6068752974b1187e61282cbc60c489b35b7e
Colin Cross [Wed, 1 Jun 2016 05:09:38 +0000 (05:09 +0000)]
Merge "Update Android.mk finder to work with Android.bp files" am:
520442f053 am:
18023b557b
am:
01437aa5d3
* commit '
01437aa5d331c3cfe75839ff05f66412cc45f1f4':
Update Android.mk finder to work with Android.bp files
Change-Id: I5854fdc7c2e595ca8c40054254be4e4eafe52cf9
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:53:04 +0000 (02:53 +0000)]
Merge "Add Soong tools to PATH" am:
b09e644e1d am:
28874dc0c1
am:
6532011f9f
* commit '
6532011f9f53aba67ff97a876e934aa48d7fa65e':
Add Soong tools to PATH
Change-Id: Ic10e248015116f577363363a45abafd3de10407b
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
Ian Pedowitz [Tue, 31 May 2016 22:38:00 +0000 (22:38 +0000)]
Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""
This reverts commit
295ad1f1f160e229417d604e62483e1871f20f4a.
Bug:
28713307
Change-Id: Icd4d48f54840cd831780e11386a74c3e1c5ae370
OSDN Git Service
