StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,121 Commits 1 Branch 0 Tags
364e42edaedd76e0e5cbcd4721178d471f9f1570
Commit Graph

30121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Dan Willemsen
d99f210545 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
 2016-06-01 23:53:44 +00:00
Jeffrey Vander Stoep
3728ebcfaf 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
 2016-06-01 23:53:42 +00:00
Dan Willemsen
58b7c1c744 Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use" 
am: 476b5b1616

* commit '476b5b161613cc352961414b549a0553361d533b':
  Add LOCAL_LOGTAGS_FILES that prebuilts can use

Change-Id: Ib0b5bb5aac8b2d1c9896d58bb2c7928a63de4241
 2016-06-01 23:47:18 +00:00
Daniel Micay
13f2b4cf2f 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
 2016-06-01 23:47:15 +00:00
Treehugger Robot
476b5b1616 Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use" 2016-06-01 23:28:10 +00:00
Jeffrey Vander Stoep
4bc8280a98 Merge "disable unpriv perf by default in user{,debug} builds" 2016-06-01 23:18:46 +00:00
Dan Willemsen
b0a08b874c 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
 2016-06-01 15:31:44 -07:00
Tao Bao
3051f4f11a 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
 2016-06-01 15:18:06 -07:00
Colin Cross
42b270f159 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
 2016-06-01 05:09:38 +00:00
Colin Cross
6a101dae79 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
 2016-06-01 05:09:38 +00:00
Colin Cross
2a73e9280b 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
 2016-06-01 05:05:34 +00:00
Colin Cross
01437aa5d3 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
 2016-06-01 05:05:33 +00:00
Colin Cross
91fbe6006a Merge "Update default NINJA_STATUS to show finished edges" 
am: 27032630c0

* commit '27032630c0683c30fa78a7bf9432c5b651707f7b':
  Update default NINJA_STATUS to show finished edges

Change-Id: I8e9989722cc5855640a0fcd68597926ce7f0dfda
 2016-06-01 05:01:30 +00:00
Colin Cross
18023b557b 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
 2016-06-01 05:01:28 +00:00
Colin Cross
27032630c0 Merge "Update default NINJA_STATUS to show finished edges" 2016-06-01 04:52:59 +00:00
Colin Cross
520442f053 Merge "Update Android.mk finder to work with Android.bp files" 2016-06-01 04:52:47 +00:00
Dan Willemsen
460481c6b6 Merge "Add Soong tools to PATH" am: b09e644e1d am: 28874dc0c1 
am: 6532011f9f

* commit '6532011f9f53aba67ff97a876e934aa48d7fa65e':
  Add Soong tools to PATH

Change-Id: Ic10e248015116f577363363a45abafd3de10407b
 2016-06-01 02:53:04 +00:00
Dan Willemsen
6532011f9f Merge "Add Soong tools to PATH" am: b09e644e1d 
am: 28874dc0c1

* commit '28874dc0c1c790005672406ea50729579096d6f4':
  Add Soong tools to PATH

Change-Id: I5a8f9a27a651c1c79469e53daa1cc34a6febbbc8
 2016-06-01 02:49:05 +00:00
Dan Willemsen
28874dc0c1 Merge "Add Soong tools to PATH" 
am: b09e644e1d

* commit 'b09e644e1db3439d85ce6dd9e371ac6514a4343c':
  Add Soong tools to PATH

Change-Id: I7ba514ee46489e44ff64b5e1be8459567102a33c
 2016-06-01 02:45:03 +00:00
Dan Willemsen
b09e644e1d Merge "Add Soong tools to PATH" 2016-06-01 02:37:19 +00:00
Dan Willemsen
60d9c673d7 Add Soong tools to PATH 
Change-Id: I8f8649106df4ba7cefbfa37a724ebe0635d90b76
 2016-05-31 18:32:35 -07:00
Ian Pedowitz
a9bc052032 Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"" 
This reverts commit 295ad1f1f1.

Bug: 28713307
Change-Id: Icd4d48f54840cd831780e11386a74c3e1c5ae370
 2016-05-31 22:55:18 +00:00
Dan Willemsen
9516a3335f Merge "Allow arm prebuilts for x86_arm builds" am: fcaae6bee8 am: 99e2c216b4 
am: 6a55b1c681

* commit '6a55b1c6813050d04c39e0705da4f056f3981511':
  Allow arm prebuilts for x86_arm builds

Change-Id: Icb91d7af56463fa97484ef36ee3e8275b2e5810e
 2016-05-31 22:25:47 +00:00
Dan Willemsen
6a55b1c681 Merge "Allow arm prebuilts for x86_arm builds" am: fcaae6bee8 
am: 99e2c216b4

* commit '99e2c216b42bc2d7cad75f1f3aab432f12678b1d':
  Allow arm prebuilts for x86_arm builds

Change-Id: Ife14aedec2f2cae4869f3ed0fb02206bcd29bbb7
 2016-05-31 22:23:11 +00:00
Dan Willemsen
99e2c216b4 Merge "Allow arm prebuilts for x86_arm builds" 
am: fcaae6bee8

* commit 'fcaae6bee83c62703339f0e54751b244ef7fd7b7':
  Allow arm prebuilts for x86_arm builds

Change-Id: Ia8a3cd4736afbf7920f4b5383cb24c99a0f9df41
 2016-05-31 22:20:19 +00:00