StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,592 Commits 1 Branch 0 Tags
d89ffa8623b750f85cbb8be01aba9fa4a9448180
Commit Graph

15592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
d89ffa8623 Fix emulator builds 
which don't have boot.img.

Change-Id: Id97a53c5356d435d9c70107ef047bed003769e22
 2014-02-05 11:29:34 -08:00
Adam Lesinski
9cee77b370 am bebb2b54: am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev 
* commit 'bebb2b54cee7a0fbf9419f6cc8659a8b16a37bd0':
  Allow multiple asset directories in aapt
 2014-02-05 00:56:13 +00:00
Adam Lesinski
bebb2b54ce am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev 
* commit '7b734fd8d163f7a71254b909fbbcd358129924b7':
  Allow multiple asset directories in aapt
 2014-02-05 00:49:37 +00:00
Adam Lesinski
7b734fd8d1 Merge "Allow multiple asset directories in aapt" into klp-modular-dev 2014-02-05 00:47:00 +00:00
Adam Lesinski
64cf9807b9 Allow multiple asset directories in aapt 
AAPT already supports this.

Change-Id: I293c7543fb43b15eedf2162416da48915ce02db8
 2014-02-05 00:13:58 +00:00
Justin Koh
19753f458b am bbfebfad: resolved conflicts for merge of 303d2755 to klp-modular-dev-plus-aosp 
* commit 'bbfebfad0d8ad002995bb1005b61a35b42a8ce35':
  Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
 2014-02-04 23:42:07 +00:00
Justin Koh
bbfebfad0d resolved conflicts for merge of 303d2755 to klp-modular-dev-plus-aosp 
Change-Id: I653cac50cf71b75d47974dde833468fa61024ae9
 2014-02-04 15:16:15 -08:00
Doug Zongker
01ce19c95f make full OTAs block based 
Instead of writing individual files and fixing up their metadata, make
full OTAs contain a system image and simply write it to the block
device.

This is only done for target-files that already contain the recovery
flashing information, older target-files still get a file-based full
OTA.

Bug: 12893978
Change-Id: If7586083c8f275e24fec49d260af5b5aff4a0a88
 2014-02-04 14:04:42 -08:00
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
Justin Koh
303d275591 Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT. 
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT, as discussed.

Change-Id: Ia2d8628c4e9ee6b3cf654c8bdfc966a4af5c573c
 2014-02-03 16:26:43 -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 49f1fab8a5: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit '03c16a309951c713ab4ab75434c9305134d72e14':
  CleanSpec for 49f1fab8a5: 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 08d410f532: 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 49f1fab8a5: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit 'aae470446504a869db05f9b70b7146ea47d746d5':
  CleanSpec for 49f1fab8a5: 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 49f1fab8a5: Rename persist.sys.dalvik.vm.lib to allow new default" 2014-01-30 22:00:33 +00:00
Brian Carlstrom
e71d9a2fd9 CleanSpec for 49f1fab8a5: 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