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

15583 Commits

Author SHA1 Message Date
Doug Zongker c9253822ea add recovery update code to system images 
Currently, the "img" zip files generated by the build system lack the
script and data needed to rewrite the recovery partition, while the
"ota" zip files do (when installed).

In order to move towards block-based OTAs, we want the result of
flashing an image and the result of installing the corresponding OTA
package to be identical.

Generate the recovery-from-boot patch and install script as part of
the process of building the target-files.  This requires breaking the
code to generate that out of ota_from_target_files into its own tool
that we can run from the Makefile.  (ota_from_target_files can still
do this, so it continues to work with older target-files.)

Bug: 12893978
Change-Id: I80e62268840780b81216e548be89b47baf81b4ac
 2014-02-04 13:50:35 -08:00
Tim Murray e858190fc4 am 47f9b9bc: am 5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base." 
* commit '47f9b9bc290dae448f07101c1fb6629285973514':
  Add new rs directory to list of Java subdirs of fw/base.
 2014-02-03 22:55:09 +00:00
Tim Murray 47f9b9bc29 am 5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base." 
* commit '5352018b0b115061bce7a2aac14780ffea3885c7':
  Add new rs directory to list of Java subdirs of fw/base.
 2014-02-03 22:44:31 +00:00
Tim Murray 5352018b0b Merge "Add new rs directory to list of Java subdirs of fw/base." 2014-02-03 22:35:54 +00:00
Ying Wang 8647c3366f am 1446cf93: am a77456b8: Merge "Dedup the targets and dependencies of required modules." 
* commit '1446cf93ede1e36f40073023e57f1ba849a72079':
  Dedup the targets and dependencies of required modules.
 2014-02-03 17:00:02 +00:00
Ying Wang 1446cf93ed am a77456b8: Merge "Dedup the targets and dependencies of required modules." 
* commit 'a77456b8e8a5e66705e48e1ec4eebc1889553c6a':
  Dedup the targets and dependencies of required modules.
 2014-02-03 00:45:03 +00:00
Ying Wang fc33037547 Dedup the targets and dependencies of required modules. 
For whatever reason, two modules may have the same file as their
installed module. In that case circular dependency is created if the two
modules have requited-by relation.

Change-Id: I15ed271ca3f3c343e4662182ded5ccc63d6c42cc
 2014-01-31 19:56:31 -08:00
Ying Wang a77456b8e8 Merge "Dedup the targets and dependencies of required modules." 2014-02-01 03:25:47 +00:00
Ying Wang 3136010cdd Dedup the targets and dependencies of required modules. 
For whatever reason, two modules may have the same file as their
installed module. In that case circular dependency is created if the two
modules have requited-by relation.

Change-Id: I15ed271ca3f3c343e4662182ded5ccc63d6c42cc
 2014-01-31 19:22:35 -08:00
Noreen Tolland d76bb1755d am 4b69be27: (-s ours) am c816e061: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev 
* commit '4b69be271c58981eccde155bbfd5ccababc19024':
  (DO NOT MERGE) Revert "Make libart the default runtime"
 2014-01-31 23:24:15 +00:00
Noreen Tolland 4b69be271c am c816e061: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev 
* commit 'c816e061270327d3e2b73ae3c848e1fefc6ec6ef':
  (DO NOT MERGE) Revert "Make libart the default runtime"
 2014-01-31 23:17:33 +00:00
Noreen Tolland c816e06127 Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev 2014-01-31 23:13:24 +00:00
Tim Murray f6752d303f Add new rs directory to list of Java subdirs of fw/base. 
Change-Id: I3213a314e7700162e781526c0450678495442759
 2014-01-31 12:32:42 -08:00
Ben Cheng bc80daffee am 09c9881f: am 5608a8c6: Merge "Add 64-bit gdbclients." 
* commit '09c9881f10fdb44accc682f8d485fab102f617aa':
  Add 64-bit gdbclients.
 2014-01-31 16:41:30 +00:00
Brian Carlstrom 7468e27676 am 03c16a30: am aae47044: Merge "CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit '03c16a309951c713ab4ab75434c9305134d72e14':
  CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-01-31 16:41:29 +00:00
Brian Carlstrom 5b40a0bd02 am a15fc8fd: am 601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit 'a15fc8fd1aad30631b7605f3120bdee3b8cf2ba4':
  build: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-01-31 16:41:28 +00:00
Narayan Kamath 966611a9c2 am 0ddbc6c2: Merge "resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp" into klp-modular-dev-plus-aosp 
* commit '0ddbc6c215c34f708fcc898be25ddffc18282881':
  CleanSpec for 08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime
 2014-01-31 16:41:27 +00:00
Ian Rogers 69968b8c57 am 1fee45f1: am e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds." 
* commit '1fee45f1af82d9dbb2e709413f020b2291205640':
  Disable WITH_HOST_DALVIK on 64bit host builds.
 2014-01-31 16:41:27 +00:00
Narayan Kamath 7201cdef71 am b1aec05a: am ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds." 
* commit 'b1aec05aae44b541aa4c579f7cc700700c91bc0b':
  Define __STDC_FORMAT_MACROS on Windows host builds.
 2014-01-31 16:41:26 +00:00
Colin Cross 8c28b594d9 am 6a7699d5: am a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY" 
* commit '6a7699d5c62d1696305f8debf4c0f90a34ad6009':
  build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
 2014-01-31 16:41:25 +00:00
Colin Cross 92ef2b3d5b am df313a04: am 2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64" 
* commit 'df313a04a1f5e4e7f3cdc626f7c571a6d12b4dec':
  build: support LOCAL_*_32 and LOCAL_*_64
 2014-01-31 16:41:24 +00:00
Ian Rogers 0e0b880c4b am eb02fa0a: am 805cb8fa: Merge "Fix the host inttypes.h problem globally." 
* commit 'eb02fa0a6b87682daca29e2ffdd6d7b422acc79f':
  Fix the host inttypes.h problem globally.
 2014-01-31 16:41:24 +00:00
Brian Carlstrom 8bc31b6d14 am d4e29f52: am cece05e2: Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default" 
* commit 'd4e29f528aa947ed7bb97596c7a2e9dd47c605e2':
  Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
 2014-01-31 16:41:23 +00:00
Nick Vaccaro 2422e76192 am ec0c99a6: Add atrace for supporting systrace tool 
* commit 'ec0c99a6c574954fb37bd94ba18b02a20edbe122':
  Add atrace for supporting systrace tool
 2014-01-31 16:41:07 +00:00
Ben Cheng 09c9881f10 am 5608a8c6: Merge "Add 64-bit gdbclients." 
* commit '5608a8c6e86381cdabc46c3a9b90564411771796':
  Add 64-bit gdbclients.
 2014-01-31 12:34:18 +00:00
Brian Carlstrom 03c16a3099 am aae47044: Merge "CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit 'aae470446504a869db05f9b70b7146ea47d746d5':
  CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-01-31 12:34:18 +00:00
Brian Carlstrom a15fc8fd1a am 601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit '601d39b688bcbb1789e145d1b72753206c24d374':
  build: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-01-31 12:34:17 +00:00
Narayan Kamath 0ddbc6c215 Merge "resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp" into klp-modular-dev-plus-aosp 2014-01-31 12:33:12 +00:00
Narayan Kamath c1375f6991 resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp 
Change-Id: Ibf80470cfcaf553335d07c6fb220f7e9ec81ed87
 2014-01-31 12:29:50 +00:00
Ian Rogers 1fee45f1af am e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds." 
* commit 'e854276dd19ee0ce139cc35f98b49189b7750b2d':
  Disable WITH_HOST_DALVIK on 64bit host builds.
 2014-01-31 12:17:16 +00:00
Narayan Kamath b1aec05aae am ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds." 
* commit 'ad9209adff8d2f94c57387ee3d3abcff28049091':
  Define __STDC_FORMAT_MACROS on Windows host builds.
 2014-01-31 12:17:03 +00:00
Colin Cross 6a7699d5c6 am a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY" 
* commit 'a8e6166fa482782719dce28a9ae1869f017e7cee':
  build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
 2014-01-31 10:27:06 +00:00
Colin Cross df313a04a1 am 2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64" 
* commit '2dcaf9f489e5dba385ae4ab75c53d184a6fb780a':
  build: support LOCAL_*_32 and LOCAL_*_64
 2014-01-31 10:27:05 +00:00
Ian Rogers eb02fa0a6b am 805cb8fa: Merge "Fix the host inttypes.h problem globally." 
* commit '805cb8fa40f71b3e1f6566bf10ca169d4a2ff86f':
  Fix the host inttypes.h problem globally.
 2014-01-31 10:26:52 +00:00
Brian Carlstrom d4e29f528a am cece05e2: Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default" 
* commit 'cece05e273dc1c9d4ea140b294df72005ac8ac53':
  Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
 2014-01-31 10:26:48 +00:00
Brian Carlstrom dbf975507b build: Rename persist.sys.dalvik.vm.lib to allow new default 
Bug: 12798969

(cherry picked from commit 49f1fab8a5)

Change-Id: I7f211fca2b9c99b607dd91590a3e4a82501e0c7f
 2014-01-30 16:05:28 -08:00
Justin Mattson b60a3f97d1 (DO NOT MERGE) Revert "Make libart the default runtime" 
This reverts commit 08d410f532.
 2014-01-30 15:30:08 -08:00
Ben Cheng 5608a8c6e8 Merge "Add 64-bit gdbclients." 2014-01-30 22:01:33 +00:00
Brian Carlstrom aae4704465 Merge "CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default" 2014-01-30 22:00:33 +00:00
Brian Carlstrom e71d9a2fd9 CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default 
Change-Id: I3ed55460864c17a199053a058b2482c6c4579622
 2014-01-30 13:56:51 -08:00
Serban Constantinescu 9b68fb2837 Add 64-bit gdbclients. 
This patch adds gdbclient combo for arm64, mips64, and x86_64.

Change-Id: I659b662276c93e5cce92aadc203a4bc111f5c2af
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
 2014-01-30 13:55:46 -08:00
Brian Carlstrom 601d39b688 Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default" 2014-01-30 21:50:48 +00:00
Brian Carlstrom 49f1fab8a5 build: Rename persist.sys.dalvik.vm.lib to allow new default 
Bug: 12798969
Change-Id: Ie73a3f2b6655d0ae3e3a905a1c64747343c525a0
 2014-01-30 13:16:37 -08:00
Brian Carlstrom 084209e278 Merge "CleanSpec for 08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime" 2014-01-30 21:10:25 +00:00
Nick Vaccaro ec0c99a6c5 Add atrace for supporting systrace tool 
Change-Id: I6504a447218a70b0d148c0b5802228fb28934a0a
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
 2014-01-30 20:33:46 +00:00
Ian Rogers e854276dd1 Merge "Disable WITH_HOST_DALVIK on 64bit host builds." 2014-01-30 19:54:04 +00:00
Brian Carlstrom 6acec48274 CleanSpec for 08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime 
Change-Id: Id632beeb2f96dd4502ac4a6c03bab5e4252137ff
 2014-01-30 11:11:38 -08:00
Ian Rogers d206afecb8 Disable WITH_HOST_DALVIK on 64bit host builds. 
Change-Id: I8cea32fe5541c3223e7f317245aab3061e8ad444
 2014-01-30 08:55:17 -08:00
Narayan Kamath ad9209adff Merge "Define __STDC_FORMAT_MACROS on Windows host builds." 2014-01-30 09:39:33 +00:00
Ian Rogers 694b2b7b12 Define __STDC_FORMAT_MACROS on Windows host builds. 
Change-Id: I89b54a63c3f111b8242fe9e813d94a839c484195
 2014-01-29 21:37:37 -08:00