openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
22,253 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

22253 Commits

Author SHA1 Message Date
Mathieu Chartier eda38d7718 am b01a4ca3: am 68f6e305: am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"" 
* commit 'b01a4ca3c838007d2e8f71c01b37f8e878cff686':
  Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
 2015-03-19 17:06:47 +00:00
Mathieu Chartier b01a4ca3c8 am 68f6e305: am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"" 
* commit '68f6e30521feced2dbd2e1dcb606f9f15cf5ec21':
  Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
 2015-03-19 16:59:02 +00:00
Mathieu Chartier 68f6e30521 am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"" 
* commit '9682e56a794f2fc68cae00475b7f11927c57b3da':
  Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
 2015-03-19 16:51:34 +00:00
Mathieu Chartier 9682e56a79 Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"" 2015-03-19 16:44:56 +00:00
Justin Morey e596433b90 am abd5bbc4: am 292427b6: am 030b5493: resolved conflicts for merge of 68000907 to lmp-mr1-dev 
* commit 'abd5bbc4febe61f53641ac7c43160e161e12c1dc':
  Bump generic_x86_64 system partition size - DO NOT MERGE
 2015-03-19 03:07:24 +00:00
Justin Morey abd5bbc4fe am 292427b6: am 030b5493: resolved conflicts for merge of 68000907 to lmp-mr1-dev 
* commit '292427b69f7b1a753c0636f916382e2a4f9648ba':
  Bump generic_x86_64 system partition size - DO NOT MERGE
 2015-03-19 03:00:29 +00:00
Justin Morey 292427b69f am 030b5493: resolved conflicts for merge of 68000907 to lmp-mr1-dev 
* commit '030b5493147d47a726e9f3e0e474772b29ad3111':
  Bump generic_x86_64 system partition size - DO NOT MERGE
 2015-03-19 02:47:00 +00:00
Justin Morey 030b549314 resolved conflicts for merge of 68000907 to lmp-mr1-dev 
Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47
 2015-03-18 21:29:09 -05:00
Mathieu Chartier 8b11285dd9 Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit" 
Bug: 19735273

This reverts commit 3abfcfc17b.

Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
 2015-03-18 19:06:28 -07:00
Tao Bao 2c92413e72 Restrict the verification in block-based incremental OTAs 
BlockImageDiff has three versions. Only the incremental OTAs generated
with the latest version (3) can be re-applied to the system that's
already on the target build. Otherwise, operations like move will make
unconditional changes and damage the system. During the verification
phase, abort the OTA update if BlockImageDiff is less than 3 and it
doesn't match the checksum of the source build.

Change-Id: Iaf834a2d99dfea0bb423a4a2aa09e8906424482d
(cherry picked from commit daebaa6ed3)
 2015-03-18 16:13:10 -07:00
Justin Morey 68000907e3 am 02060b7b: Bump generic_x86_64 system partition size - DO NOT MERGE 
* commit '02060b7bddbb8728fa5a4ba5e0905e5a173bc682':
  Bump generic_x86_64 system partition size - DO NOT MERGE
 2015-03-18 23:00:33 +00:00
Justin Morey 02060b7bdd Bump generic_x86_64 system partition size - DO NOT MERGE 
This makes it big enough to hold Orla, unbreaking the build

Change-Id: I5a131dfbaaa3aa2bb1bc24e4f859cc3507b671b0
 2015-03-18 21:04:14 +00:00
Yohann Roussel 12f28287dc Merge "Use java -jar ... instead of java -cp ..." 2015-03-17 17:34:27 +00:00
Yohann Roussel 76a5e0bd1a Use java -jar ... instead of java -cp ... 
When running Jack or Jill.

Change-Id: I2127f183f8f033a9d35a7e8247a9432252a58bc8
 2015-03-17 17:03:22 +01:00
Mathieu Chartier 7c2d49dcb9 am 7b93109e: am d7f3d8ba: am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit" 
* commit '7b93109e48f90f756228bfe399b67d5d8cc306b0':
  Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
 2015-03-17 14:47:31 +00:00
Christopher Ferris d268c14454 am e0881796: am 8081a8b5: am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9"" 
* commit 'e088179677b50cac9ef7c1ab83e89ed338a9b7ed':
  Revert "Switch x86 and x86_64 build to use GCC 4.9"
 2015-03-17 14:47:30 +00:00
Elliott Hughes e0203b17fa am bf8164f9: am 47584657: am 0f98a378: Merge "Remove netcfg from the list of base modules." 
* commit 'bf8164f938f0af98b76e481de6c415fa496cfe21':
  Remove netcfg from the list of base modules.
 2015-03-17 14:47:28 +00:00
Mathieu Chartier 7b93109e48 am d7f3d8ba: am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit" 
* commit 'd7f3d8ba74c25c80fcb5032e6b59e121e5546f98':
  Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
 2015-03-17 14:41:15 +00:00
Christopher Ferris e088179677 am 8081a8b5: am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9"" 
* commit '8081a8b5960055c12ad50ba9a8651fe3adb4b370':
  Revert "Switch x86 and x86_64 build to use GCC 4.9"
 2015-03-17 14:41:13 +00:00
Elliott Hughes bf8164f938 am 47584657: am 0f98a378: Merge "Remove netcfg from the list of base modules." 
* commit '475846579e99aaeeddaaaf23c67435b6daca13e2':
  Remove netcfg from the list of base modules.
 2015-03-17 14:41:12 +00:00
Mathieu Chartier d7f3d8ba74 am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit" 
* commit '8ca542f4394affd420271d8df946e199449508e6':
  Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
 2015-03-17 14:32:51 +00:00
Christopher Ferris 8081a8b596 am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9"" 
* commit '13169ccba2d9e11e311babd8fc80f41c610c753e':
  Revert "Switch x86 and x86_64 build to use GCC 4.9"
 2015-03-17 14:32:50 +00:00
Elliott Hughes 475846579e am 0f98a378: Merge "Remove netcfg from the list of base modules." 
* commit '0f98a3781c4fab57bdd696cca3edd6614d65abe6':
  Remove netcfg from the list of base modules.
 2015-03-17 14:32:48 +00:00
Mathieu Chartier 8ca542f439 Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit" 2015-03-17 02:04:42 +00:00
Christopher Ferris 1a97c05380 Revert "Switch x86 and x86_64 build to use GCC 4.9" 
This reverts commit 533c7aa6a2.

(cherry picked from commit f123057f5e)

Change-Id: I6dd4ccb100341cf6ebf83829448b0ca7395d5468
 2015-03-16 18:32:54 -07:00
Christopher Ferris 13169ccba2 Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9"" 2015-03-17 01:31:16 +00:00
Christopher Ferris f123057f5e Revert "Switch x86 and x86_64 build to use GCC 4.9" 
This reverts commit 533c7aa6a2.

Change-Id: I5203db8454d9af8fb438af6308106945e5dc0dbf
 2015-03-17 01:29:51 +00:00
Elliott Hughes 0f98a3781c Merge "Remove netcfg from the list of base modules." 2015-03-17 00:58:29 +00:00
Andrew Hsieh a9ee744457 am 58b2f1e3: am 81f7dee7: am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9" 
* commit '58b2f1e320a9682871cd4f7e4379c8bf167a2204':
  Switch x86 and x86_64 build to use GCC 4.9
 2015-03-17 00:13:55 +00:00
Andrew Hsieh 58b2f1e320 am 81f7dee7: am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9" 
* commit '81f7dee74cc436fa47339a884467cc241dd86dc7':
  Switch x86 and x86_64 build to use GCC 4.9
 2015-03-17 00:07:39 +00:00
Andrew Hsieh 81f7dee74c am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9" 
* commit 'bf0b6df4c15c2e7bbfd3a8b84d7c627cc3b7127f':
  Switch x86 and x86_64 build to use GCC 4.9
 2015-03-16 23:59:04 +00:00
Andrew Hsieh bf0b6df4c1 Merge "Switch x86 and x86_64 build to use GCC 4.9" 2015-03-16 23:50:19 +00:00
Mathieu Chartier 3abfcfc17b Rename dalvik.vm.usejit to debug.dalvik.vm.usejit 
Bug: 19735273
Change-Id: Ia0d748b511230f5e0c7d0763de3abeab9d6e0ca7
 2015-03-16 16:29:30 -07:00
Elliott Hughes f3124b3523 Remove netcfg from the list of base modules. 
It's obsolete and -- other than a mention in the reference RIL and
another in a shell script that no longer works -- unused.

Change-Id: Ibbf2613778802222865528644c7e59a2d7c68b48
 2015-03-16 13:52:30 -07:00
Ying Wang f13fb8446a Merge "Apply jack redirection flag to also custom ANDROID_JACK_EXTRA_ARGS" 2015-03-16 20:29:03 +00:00
Ying Wang c2050db7d6 am 2219b1d8: am efc3a220: am d73696c1: Merge "Load cts/build/config.mk after build/core/config.mk" 
* commit '2219b1d8efc20b59ae8231ac619c9ea20fe51e8e':
  Load cts/build/config.mk after build/core/config.mk
 2015-03-16 20:26:23 +00:00
Ying Wang 2219b1d8ef am efc3a220: am d73696c1: Merge "Load cts/build/config.mk after build/core/config.mk" 
* commit 'efc3a22009b15c389041427f8c74f551243b60d0':
  Load cts/build/config.mk after build/core/config.mk
 2015-03-16 19:07:43 +00:00
Ying Wang efc3a22009 am d73696c1: Merge "Load cts/build/config.mk after build/core/config.mk" 
* commit 'd73696c1fefface6f3d2311d1dead3afae01b048':
  Load cts/build/config.mk after build/core/config.mk
 2015-03-16 19:01:59 +00:00
Ying Wang e9f0226655 Apply jack redirection flag to also custom ANDROID_JACK_EXTRA_ARGS 
Bug: 19715777
Change-Id: I4ad9c9f51bf418afe29f5a682f630d6071cd33a2
 2015-03-16 11:59:41 -07:00
Ying Wang d73696c1fe Merge "Load cts/build/config.mk after build/core/config.mk" 2015-03-16 18:57:37 +00:00
Eric Laurent 3131486892 Merge "added broadcast radio service" 2015-03-16 18:29:05 +00:00
Ying Wang f738b3bb9f Load cts/build/config.mk after build/core/config.mk 
So that the cts config.mk can use global variables set by the core build
system config.mk.

Change-Id: I2571564abbb53257eee54485a3357ab1305eb870
(cherry picked from commit bacf5f8008)
 2015-03-16 10:56:03 -07:00
Yohann Roussel 1ccaa8fbd8 Merge "Make Jack use tmp dir specified by TMPDIR" 2015-03-16 17:08:01 +00:00
Yohann Roussel f528e132d6 Make Jack use tmp dir specified by TMPDIR 
If the environment variable is defined.

Bug: 19654122
Change-Id: Ib238a2c2eb60296a96de98a4a54e0996d4c8a958
 2015-03-16 15:59:33 +01:00
Yohann Roussel f252faae65 Merge "Redirect jack warnings to stdout" 2015-03-16 14:06:29 +00:00
Andrew Hsieh 533c7aa6a2 Switch x86 and x86_64 build to use GCC 4.9 
Change-Id: I41a7650d0e56c820a59c261d16afd6f0b9ec38c2
 2015-03-16 13:17:59 +08:00
Tao Bao aecbda7f26 resolved conflicts for merge of 22311914 to master 
Change-Id: I8684191fa3efea0ed546bbad076f8760a13c5c81
 2015-03-14 00:26:06 -07:00
Tao Bao 2231191482 resolved conflicts for merge of 6502ae93 to lmp-mr1-dev-plus-aosp 
Change-Id: I3ffed7f5a32363d5a4481eebddff8feff3c4ebee
 2015-03-13 22:40:38 -07:00
Tao Bao 6502ae93e1 am 18b27966: Merge "Restrict the verification in block-based incremental OTAs" 
* commit '18b27966a66a27da7b7199ab3e4351e9369cf060':
  Restrict the verification in block-based incremental OTAs
 2015-03-14 05:08:38 +00:00
Tao Bao 18b27966a6 Merge "Restrict the verification in block-based incremental OTAs" 2015-03-14 05:01:34 +00:00