Commit graph

2557 commits

Author SHA1 Message Date
Daniel Berlin
f5a97d7fbb Moving notice file generation to a python script
(it was getting fairly complicated in bash),
update HTML output to have a table of contents,
and fix typos/bugs in notice file CSS

Change-Id: I51131f594e3bbe63f03165fa42f5ceeaec518543
2012-03-30 15:08:59 -04:00
Brian Swetland
7a5960555b Introduce TARGET_BUILD_PDK for selecting build tweaks for the PDK
BUILD_PDK and some of the other infrastructure will go away once
we're done with the new new PDK work, but for now don't disturb
that stuff.

Change-Id: Ia39bf759ec03f203858ddcc4880af72bd132cb5a
2012-03-23 16:04:13 -07:00
Raphael Moll
74160ed4c4 SDK atree: support HOST_OUT location.
Change-Id: Ib369280971b37a3eb35ac94991cdbc49dead903e
2012-03-21 22:34:48 -07:00
Mike Lockwood
e8eb8df989 Merge commit 'c6e952f'
Don't build userdata.img for tests build.

Change-Id: I492cca5e5989cabdeb6f75c3b8a8c9ac3b9ca8c8
2012-03-21 17:01:18 -07:00
Steve Block
d14d3b4e64 Add a comment about publishing licenses for third-party code
Change-Id: I21bee0bb78ab42b4f7b6a938f94653c7e21e8503
2012-03-21 17:05:11 +00:00
Ying Wang
bf69aa32c9 Fix tests build.
Use the conditional only after the tests build variant is phased out.

Change-Id: Ide691700dda4bbf56c6f81f923d1b8c5eb196b85
2012-03-13 19:49:59 -07:00
Ying Wang
160b670f4a Add build goal "tests".
Bug: 5368571
The phony build goal "tests" will eventually replace the build variant
tests.

Change-Id: Ia656f2cf2260feeaa8fa32e9221b7f9ce0990262
2012-03-13 19:12:21 -07:00
Ying Wang
c5f049799c Remove system partition files from the test zip file.
Bug: 6157562
Change-Id: I581c6db7d47b42617f8ef6097ccd0aae52c7e1b4
2012-03-13 11:22:04 -07:00
Keun young Park
7fc7aad152 changes to add pdk1 / pdk2 build for PDK build
- additional files will be added to pdk/build
Bug: 6079146

Change-Id: Ieb5fcab8002193250d770b923f60ec7333ce84e5
2012-03-12 11:49:34 -07:00
Raphael Moll
3ab307a68c SDK: Also read sdk/build/tools.OS.atree
This allows us to have per-host OS (or OS + arch) atree files in case we
need to get tools which source varies per host OS, example:
- sdk/build/tools.linux.atree
- sdk/build/tools.linux-x86_64.atree
- sdk/build/tools.windows.atree
etc.

Change-Id: I9a1256548345fb866b0750fce6810913413dd946
2012-03-02 12:40:04 -08:00
Steve Block
495e58502a Revert "Remove unused notice_files target"
This broke the PRODUCT-sdk-(win_)sdk target of SDK builds

This reverts commit 620a5270fc.

Change-Id: I81afe68ae98b5daac5fe136ec8d04f6fba5af9b4
2012-02-29 20:09:09 +00:00
Steve Block
620a5270fc Remove unused notice_files target
The notice_files target generates $(TARGET_OUT_INTERMEDIATES)/NOTICE.txt and
$(TARGET_OUT_INTERMEDIATES)/NOTICE.html. The former is not needed and the
latter is an explicit dependency of $(TARGET_OUT_INTERMEDIATES)/NOTICE.html.gz.
We can therefore remove the target and the logic to generate NOTICE.txt.

Change-Id: I6179c049bebe590c7298e8be0a30e30265423468
2012-02-29 16:00:58 +00:00
Jean-Baptiste Queru
418027c87a am 41ab528f: am 99505268: am 20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
* commit '41ab528fe3533847fecddb0c6ee7884b17f35279':
  Issue warning when "make snod" with dexpreopt enabled.
2012-02-24 11:38:53 -08:00
Ying Wang
acf01ec837 Issue warning when "make snod" with dexpreopt enabled.
Change-Id: I481f963634dd384ed6d3de73dfeeda92b37d227e
2012-02-24 11:05:48 -08:00
Jean-Baptiste Queru
8f8624e61f am 9caacbd7: am 5ea72eff: Use the new location of the emulator kernel
* commit '9caacbd74328624dfc753cecfc42cb29bf14bfad':
  Use the new location of the emulator kernel
2012-01-06 17:41:07 -08:00
Jean-Baptiste Queru
5ea72effbd Use the new location of the emulator kernel 2012-01-06 17:02:24 -08:00
Jean-Baptiste Queru
7353e43b85 am da1c81ab: am a230c4d0: Reference kernel notice in the new location
* commit 'da1c81abe48c76f59953fd2e14a2ae2283d7bf92':
  Reference kernel notice in the new location
2012-01-06 15:22:50 -08:00
Jean-Baptiste Queru
a230c4d049 Reference kernel notice in the new location 2012-01-06 15:05:53 -08:00
Ying Wang
193010cc8f Print out ignored PRODUCT_COPY_FILES
So that people know their files are not really copied in accident.

Change-Id: I8fab920483230a9f349304dcbdb2fb9d60ee0215
2011-12-16 11:56:24 -08:00
Ying Wang
c6e952fec1 Don't build userdata.img for tests build.
Change-Id: I2982223919267f7b98f47b002c435e443674729a
2011-11-16 11:12:41 -08:00
Raphael
2a533178c1 SDK: pass $HOST_OUT variable to atree.
Required by Change Id623bbef45 in development.git

Change-Id: I43229f1e6aaeea176df92a499b9cda3237fb36b9
2011-11-15 16:32:42 -08:00
Ying Wang
9f8e8db188 Build cache.img on demand
Bug: 5153694
To build cache.img, set BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE (required,
ext4 only for now), BOARD_CACHEIMAGE_PARTITION_SIZE (optional) in
BoardConfig.mk.

Change-Id: I1d8b91646aa1dba88285e008ad3335768bcbddd2
2011-11-10 14:30:34 -08:00
Ying Wang
c0debb9b5e Revert "Build cache.img."
This reverts commit 531bdb546a.
2011-11-02 11:19:28 -07:00
Ying Wang
531bdb546a Build cache.img.
Change-Id: I3dbe7afa4934fa718ba20605eebd2e3ce2ae82ab
2011-11-01 10:44:19 -07:00
Ying Wang
178ef923ac Fix build.
Change-Id: I166d4e0c5cc4d2b58c7af3f0207b2d161a9d1715
2011-10-31 18:13:30 -07:00
Ying Wang
bd93d425ae Unify the user image building code
Bug: 5398808

Before this change we have duplicate code in the Makefile and the
python-based releasetool. That's a real headache to maintain.

Change-Id: I8ddf04a79c6886540e89d990f723d8f77c9dd883
2011-10-31 17:11:35 -07:00
Doug Zongker
68fbf0fa52 am 49c6a2b5: fix build fingerprint: dev-keys vs test-keys
* commit '49c6a2b5e4314bd8acfbca88cd43ea49a2c8c30e':
  fix build fingerprint: dev-keys vs test-keys
2011-10-05 13:06:30 -07:00
Doug Zongker
49c6a2b5e4 fix build fingerprint: dev-keys vs test-keys
The fingerprint should only say dev-keys if it's actually using custom
keys; builds with the old default (from build/target/product/security)
should still say test-keys.

Change-Id: Ib8c662c348cf63f5db47e2f8f81bc3246cb15fdc
2011-10-05 12:41:56 -07:00
Ed Heyl
213c1f985d am 81703a19: Merge "Support for product-specific dev keys." into ics-factoryrom
* commit '81703a19001ec219c35cb0ecf9bafb6e0dbc1e1d':
  Support for product-specific dev keys.
2011-10-04 16:15:25 -07:00
Ying Wang
3c21fe5b12 Support for product-specific dev keys.
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
2011-10-04 10:50:08 -07:00
Ying Wang
6886410210 Enforce no prebuilt apks in PRODUCT_COPY_FILES.
Bug: 5391935
Change-Id: I106ffc3277914e57cc1a6fb4cd782286d61b8013
2011-09-29 13:23:25 -07:00
Ying Wang
f272cd6c22 Generate an empty target if there is no packages
Generate an empty target even if there is no packages defined in the
source tree. Such case can happen when building in an unbundled branch.

Change-Id: Id8b94bc00557cd5ea2066859e440427474ced5f5
2011-09-26 12:05:06 -07:00
Xavier Ducrohet
4d2b9bf341 Cherrypick 6de7bc61 from master. do not merge.
Copy notice file in the new system image folder

Change-Id: I66496f382b2d13b030de569b573630f3abe5b9de
2011-09-21 16:03:19 -07:00
Xavier Ducrohet
6de7bc611b Copy notice file in the new system image folder
Change-Id: I4fafe5dc9dc1749de56267206a9b847a97e6a14b
2011-09-21 14:25:52 -07:00
Doug Zongker
c30e190347 am 7094bf3a: am 25863d73: build the sqlite3 binary for use by the OTA tools
* commit '7094bf3a5e9d1983d6877f580506d93fd736c437':
  build the sqlite3 binary for use by the OTA tools
2011-09-20 09:31:54 -07:00
Doug Zongker
7094bf3a5e am 25863d73: build the sqlite3 binary for use by the OTA tools
* commit '25863d738ca171015a57a2154ff6ebe4ae8f5483':
  build the sqlite3 binary for use by the OTA tools
2011-09-20 09:27:07 -07:00
Doug Zongker
25863d738c build the sqlite3 binary for use by the OTA tools
Change-Id: I2c6cc02dec74fdcedd3e2a6f3ddb1dfba657a883
2011-09-19 16:50:39 -07:00
Raphael
77fed26921 Don't strip llvm-rs-rc in core/Makefile. DO NOT MERGE.
This is done in development/build/sdk.atree now.

Cherry-pick from master 469bbdf8c3
2011-09-16 21:25:49 -07:00
Raphael
469bbdf8c3 Don't strip llvm-rs-rc in core/Makefile
This is done in development/build/sdk.atree now.

Change-Id: I2cd8e42192439851e1e42070cf74e6ee7c02ba59
2011-09-15 11:22:28 -07:00
Ying Wang
e5e8c5f218 Move forward installed-files.txt in the dependency graph
Bug: 5265104
- Move installed-files.txt forward to ahead of system.img in the
dependency graph, so that even if the system.img fails to build due to
too large size we can still get the size stats.
- Change the script tools/fileslist.py to sort items in decreasing size.

Change-Id: I5913bc51971e341ffbfcf3fa449c987f126e409b
2011-09-09 17:07:23 -07:00
Doug Zongker
23f8bde52d save uid/gid/mode information of boot and recovery files
Save these in the target_files so we don't have to depend on using the
contents of android_filesystem_config.h at the tip of tree.

Bug: 5266067
Change-Id: Ica5dd43a2013c9db72d7c9434f9d7de1abaf18f9
2011-09-07 14:11:51 -07:00
Justin Ho
bdab41a16f Add image size calcuations into the script
Change-Id: Ide13a873982bae21e2b8735a235389a660abd592
2011-09-01 13:46:54 -07:00
Justin Ho
b139b6a1a5 Calculate system image size at build, for harvesting later
Change-Id: I6bfcde0e5df3f6da453f28354839e356f9191c0e
2011-08-31 16:29:31 -07:00
David 'Digit' Turner
9a1dd17028 am 3db43165: am 80d41e4b: am a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"
* commit '3db43165b09defcbeebdbeddff158b4e1f85d5c4':
  sdk: add DLL_EXTENSION as an atree variable
2011-08-29 11:04:47 -07:00
David 'Digit' Turner
3db43165b0 am 80d41e4b: am a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"
* commit '80d41e4b7555aed399c7bd23647947d7eade3fe6':
  sdk: add DLL_EXTENSION as an atree variable
2011-08-25 14:30:00 -07:00
David 'Digit' Turner
557c51f2ea sdk: add DLL_EXTENSION as an atree variable
This patch defines the DLL_EXTENSION variable to the host
shared library suffix (i.e. either ".so", ".dll" or ".dylib")
when packaging the SDK.

This is required by another patch to sdk/build/tools.atree that
will use ${DLL_EXTENSION} to copy the GLES emulation host libraries
to $SDK/tools/lib

Change-Id: I120d39e905afb453b0702d5f0eb2707f214385cc
2011-08-25 14:28:03 +02:00
Jeff Brown
e33ba4c49e Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
2011-07-11 23:51:37 -07:00
David 'Digit' Turner
690b9b316f am 11e1d5fb: am 6236d356: am b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent atree files"
* commit '11e1d5fb3a33de9c5aad7c21294b8019a0f042b8':
  sdk: provide ABI-dependent atree files
2011-06-27 14:14:33 -07:00
Raphael
4839e47309 am 2ec35cc8: am 4aed6434: am 0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.
* commit '2ec35cc88f10bcd11d3a193d58a1ab245caebce5':
  SDK: properly strip all SDK llvm-rs-cc linux binaries.
2011-06-23 14:31:21 -07:00
David 'Digit' Turner
11e1d5fb3a am 6236d356: am b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent atree files"
* commit '6236d356a01150bc517bd639398df704735cc0fc':
  sdk: provide ABI-dependent atree files
2011-06-23 13:13:20 -07:00
David 'Digit' Turner
77ec16ae9e sdk: provide ABI-dependent atree files
This patch allows development/sdk/ to provide ABI-specific .atree
files. This is useful to copy prebuilt CPU model-specific files
to the SDK platform image directory.

This is needed to deal with the fact that for ARMv7 platform builds,
the kernel image to use is prebuilt/android-arm/kernel-qemu-armv7 instead
of prebuilt/android-arm/kernel/qemu

Change-Id: Icdca751852c01421fccf196436a9bc1114ea90f7
2011-06-23 12:49:02 +02:00
Raphael
2ec35cc88f am 4aed6434: am 0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.
* commit '4aed64341c6cff484c9b78fed3d13131049858c9':
  SDK: properly strip all SDK llvm-rs-cc linux binaries.
2011-06-22 19:10:23 -07:00
Raphael
0b6ece9daf SDK: properly strip all SDK llvm-rs-cc linux binaries.
Change-Id: Id3f024e90ef04eff4cc13a2202fcc9e94c5ac72f
2011-06-22 17:11:24 -07:00
Ying Wang
7e8d442ca4 Uniq the system properties.
If multiple items with the same key appear in a config variable,
only the first item is taken.

Change-Id: Icf57befafb36ec35dd4d48c8c3ec595f353f68e7
2011-06-17 17:10:04 -07:00
Mike Lockwood
0d23fec792 Add support for products overriding properties in /default.prop
We need this to allow products to specify the default USB configuration,
and allow the build system to add adb to this configuration
for eng and userdebug builds.

For example:

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
	persist.sys.usb.config=mtp

Change-Id: I83d7d918e57a8117eb96919e17d8ad52afdc0388
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-09 14:54:40 -07:00
Joe Onorato
9197a487b4 post process the system properties
Change-Id: Ib78fe238d90dd4523326e4fa088d9333edc9e299
2011-06-08 16:04:14 -07:00
Ying Wang
fdc3192e68 resolved conflicts for merge of bd0c91c8 to gingerbread-plus-aosp
Change-Id: Ia4d8719337f84927f96a162b97df8a8bc62630e1
2011-03-31 17:00:13 -07:00
David 'Digit' Turner
53d2a9a1ac am 440d7e1e: am 9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension."
* commit '440d7e1e5bb732ff8638af40e112e1df98e1f537':
  Support target-specific sdk/build/tools.atree extension.
2011-03-28 17:41:22 -07:00
Raphael
9b4660a1c6 resolved conflicts for merge of db0d59d1 to honeycomb-plus-aosp
Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30
2011-03-25 15:13:55 -07:00
Raphael
bd0c91c8b9 Merge c4d4731b4d: 'Build SDK repository'. Do not merge.
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I863ac8baf159432d7c95df46cba6e4f3b9122629
2011-03-24 13:41:35 -07:00
David 'Digit' Turner
440d7e1e5b am 9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension."
* commit '9fe6dc2c17ba6113ff4031feaeea7dac0ba5d5a3':
  Support target-specific sdk/build/tools.atree extension.
2011-03-23 11:07:51 -07:00
David 'Digit' Turner
74b0c36882 Support target-specific sdk/build/tools.atree extension.
The purpose of this patch is to add the ability to specify a
target-specific extension to sdk/build/tools.atree, under the
name sdk/build/tools.$(TARGET_ARCH).atree

This is needed to move x86-specific changes out of tools.atree
in order to fix the build of internal Android branches that
don't include other x86-related changes to the build system.

Another patch, following this patch, will fix the build itself
by moving the x86-stuff to sdk/build/tools.x86.atree.

NOTE: The root cause of the problem is that tools.atree
probably shouldn't be in the public AOSP repository, but
under development/build/ instead. However, fixing this
requires more drastic changes to the build system.

Change-Id: Ie365c55527bcad38e1e5248f618e2fd5a96431a1
2011-03-23 11:20:14 +01:00
David Turner
db0d59d1b4 am b1047a99: Merge changes I00c75f37,I1fc3cb49
* commit 'b1047a99ce8b8d62ef911c5dfba7183c32e80a70':
  x86: the -mbionic flag is needed for IA builds.
  x86: qemu emulator is the default build target
2011-03-22 06:03:40 -07:00
Doug Zongker
095dbffd60 am 5d4808db: put extra recovery keys in the product definition
* commit '5d4808db1630048f6eb0610b75af01c9fc877412':
  put extra recovery keys in the product definition
2011-03-16 11:17:24 -07:00
Doug Zongker
5d4808db16 put extra recovery keys in the product definition
Change-Id: I71637cd578b24891c10171aa59406848649be703
2011-03-16 07:52:25 -07:00
Xavier Ducrohet
3509469b43 am 4216a8c9: Add the host notice file to the SDK platform-tools folder.
* commit '4216a8c94e320b7025acd6bf99bac4f9ae45c5c7':
  Add the host notice file to the SDK platform-tools folder.
2011-03-15 13:50:56 -07:00
Xavier Ducrohet
4216a8c94e Add the host notice file to the SDK platform-tools folder.
Change-Id: Id9e789fed635c6e5b43254f8ef6ec353302ca1be
2011-03-15 13:28:40 -07:00
Bruce Beare
18a130e98a x86: qemu emulator is the default build target
Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
2011-03-15 07:47:48 -07:00
Ying Wang
70d6ec5f9b resolved conflicts for merge of 0a1f3236 to honeycomb-plus-aosp
Change-Id: I6596f4a65a99eed98bdca2d8a6840bc378297b6d
2011-03-07 11:07:12 -08:00
Ying Wang
582222190f am 9238d44c: Only copy once even if the first matched src:dest pair appears more than once.
* commit '9238d44c92b355bac6b7a13b23f298336338bf3d':
  Only copy once even if the first matched src:dest pair appears more than once.
2011-03-04 17:13:08 -08:00
Ying Wang
0a1f3236e3 am a73b6561: Drop support for target files with no recovery.fstab.
* commit 'a73b6561cee39ad416f4af327dbe72ec565d2423':
  Drop support for target files with no recovery.fstab.
2011-03-04 17:13:04 -08:00
Ying Wang
9238d44c92 Only copy once even if the first matched src:dest pair appears more than once.
Change-Id: I476923007dac1174371d6e6526d72182eb6c7243
2011-03-04 15:10:15 -08:00
Ying Wang
a73b6561ce Drop support for target files with no recovery.fstab.
Change-Id: I099298cfffc2546975732a3bf0df60f96ccbdac4
Meanwhile don't build the ota and update zip files if no recovery.fstab
found.
2011-03-04 14:42:13 -08:00
Ying Wang
2adc50374a sdk.atree does not need DIST_DIR any longer.
Change-Id: I34d8f13e1ddc27f853e3f15cfe0351d780a47aa8
2011-03-01 16:13:41 -08:00
Raphael Moll
b48e7c400b Pass DIST_DIR to sdk.atree
Change-Id: I224781b13bfbf11de553d201b4c2214f93235a67
2011-03-01 11:14:07 -08:00
Doug Zongker
419e19121c am 5e2afb97: am eaa464e6: am a34fa95c: force inclusion of system log tags in the event-log-tags file
* commit '5e2afb977fcec46e001ac57cc76d3b9534696afa':
  force inclusion of system log tags in the event-log-tags file
2011-02-23 13:34:59 -08:00
Doug Zongker
5e2afb977f am eaa464e6: am a34fa95c: force inclusion of system log tags in the event-log-tags file
* commit 'eaa464e6c4064ce8359d3e5871e0d184388457b8':
  force inclusion of system log tags in the event-log-tags file
2011-02-23 13:31:15 -08:00
Doug Zongker
eaa464e6c4 am a34fa95c: force inclusion of system log tags in the event-log-tags file
* commit 'a34fa95c164a9388ed0b84b17a63241bffd4132a':
  force inclusion of system log tags in the event-log-tags file
2011-02-23 13:25:45 -08:00
Doug Zongker
a34fa95c16 force inclusion of system log tags in the event-log-tags file
Change-Id: I59066ff151b6cb74a70bd8a900d473a533c84de3
2011-02-23 12:17:29 -08:00
Raphael
336cd7dcb0 Merge "Build SDK repository" 2011-02-22 14:36:00 -08:00
Ying Wang
1b5f1dc30f Use shell variable, instead of makefile var.
Change-Id: I802b145b563145437135412473704f911c8c1474
2011-02-17 15:44:45 -08:00
Raphael
c4d4731b4d Build SDK repository
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: Ie7e0f789bafd73d5ee2461349155a6e562e2edd9
2011-02-16 20:27:59 -08:00
Ying Wang
15e487a792 Don't build everything for APKCERTS_FILE
Before this change, to build APKCERTS_FILE you have to build any modules
in the system first, which include modules that only need to be checked,
instead of being built. This can reduce the build time when "dist" is
specified.

Change-Id: I64bee67977adcaf7b7c8df3f8f6492c9c33bc69d
2011-02-15 10:56:18 -08:00
Ying Wang
279f3084bb Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg generic_x86
Also don't build ota package for generic_x86.

Change-Id: I7606d56b312ac2e0c3514a8f250e005e0c05a3f1
2011-02-09 13:11:50 -08:00
Raphael
79e1d2cf99 am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
* commit '6b6e8114810bb26a64e1d8d9814fdfadb90c3848':
  SDK: Strip llvm-rs-cc in SDK.
2011-02-03 09:05:07 -08:00
Raphael
ea55056f19 am 3e57da17: am 7a6a9c35: SDK: Strip llvm-rs-cc in SDK.
* commit '3e57da17d1bd1e61c440910fbb441ba6997314d9':
  SDK: Strip llvm-rs-cc in SDK.
2011-02-02 16:20:08 -08:00
Raphael
7a6a9c3528 SDK: Strip llvm-rs-cc in SDK.
SDK Bug: 3394374

Change-Id: I2b0e46d9f94d488611bd79193f4a11cc0f36be51
2011-02-02 12:05:31 -08:00
Raphael
39f4b566da SDK: Strip llvm-rs-cc in SDK.
SDK Bug: 3394374

Change-Id: I728112795ad40a31a1b4c476e043ef213241c617
2011-02-02 11:31:38 -08:00
Doug Zongker
e121d6acf4 support TARGET_EXTRA_RECOVERY_KEYS
Specifying one or more key files (without .x509.pem extension) as
TARGET_EXTRA_RECOVERY_KEYS causes them to be included as acceptable
keys for recovery packages.  They are *not* included in otacerts.zip,
so actual downloaded over-the-air packages can't use them, but they
can be used to sign sideload-only packages.

Bug: 3413359
Change-Id: I6f248ffa35f0c6b125dd8a7517493017e236c776
2011-02-01 14:13:52 -08:00
Ying Wang
008367111e Don't increase image sizes for the release tools.
So it keeps consistent with the command run in the makefile.

Change-Id: Id26fa3387aa9bbab88c4ef3fbd26aff0d039c2e1
2011-01-14 11:30:56 -08:00
Raphael Moll
ce7b1d5827 am e503fcd5: am 7e27c8e1: Merge "Pass OUT_DIR variable to atree."
* commit 'e503fcd52ec8bbcc9fd4ea4b242f73c6c2cae3d3':
  Pass OUT_DIR variable to atree.
2011-01-05 15:50:22 -08:00
Raphael Moll
e503fcd52e am 7e27c8e1: Merge "Pass OUT_DIR variable to atree."
* commit '7e27c8e15507d62a0ac0b094bc7cfca15f6cc509':
  Pass OUT_DIR variable to atree.
2011-01-05 15:48:24 -08:00
Raphael Moll
7558ad55ce Pass OUT_DIR variable to atree.
Change-Id: Iabbe905341dfe970448682a9dcbb170a04ad5222
2011-01-05 14:58:17 -08:00
Jean-Baptiste Queru
54c5e5b18b am 1b8c01db: Merge "Product-configurable sparse ext images."
* commit '1b8c01dbee93366e31b67529a26e1a7b6198c876':
  Product-configurable sparse ext images.
2010-12-28 13:51:53 -08:00
Ying Wang
085a14698b Product-configurable sparse ext images.
Also pass extfs sparse image flag to the release tool.

Change-Id: I79a6a71873634a231aa8990cee22374259601505
2010-12-28 13:41:33 -08:00
Jean-Baptiste Queru
1ee80eefc7 am dbd43691: am 3ef1d674: am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."
* commit 'dbd43691870fa64d1ad79371e3d796ed8e63b3b9':
  Make image-size-from-data-size not use hard coded values.
2010-12-06 16:45:01 -08:00
Jean-Baptiste Queru
dbd4369187 am 3ef1d674: am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."
* commit '3ef1d674806734c2e237a54815ea5c077ce8c344':
  Make image-size-from-data-size not use hard coded values.
2010-12-06 15:12:02 -08:00
Jean-Baptiste Queru
3ef1d67480 am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."
* commit '4985f06f4e96351c77b88b20bc9ded65daefcd3e':
  Make image-size-from-data-size not use hard coded values.
2010-12-06 15:10:35 -08:00
Lars Svensson
9cb8c28352 Make image-size-from-data-size not use hard coded values.
The function image-size-from-data-size was using hard
coded values. The size of spare area and pages has become
configurable so we need to read from the variables.

Change-Id: I9461d34400ffc2cc5920860d8aa78750d559e397
2010-12-06 16:18:46 +01:00
Sriram Raman
ff83c8593e resolved conflicts for merge of 064a4562 to master
Change-Id: I795e2b6ba842541fc941c1da396734198a12ea72
2010-11-30 15:09:19 -05:00
Sriram Raman
064a4562a4 am c647aeca: Add mkuserimg.sh, make_ext4fs to otatools
* commit 'c647aecabb9cf03d73cfc34836e3bfc886b54c2e':
  Add mkuserimg.sh, make_ext4fs to otatools
2010-11-30 11:45:14 -08:00
Sriram Raman
c647aecabb Add mkuserimg.sh, make_ext4fs to otatools
Change-Id: Id48d6643f4579d695685fe2595bd86a80a5083c3
2010-11-29 18:55:39 -05:00
Jean-Baptiste Queru
3f43f96280 am 29ead582: am d2dd8652: Merge "Added generic hook for loading vendor specific tasks."
* commit '29ead58259d47997d7caedf9080f4a2f9c9bd358':
  Added generic hook for loading vendor specific tasks.
2010-11-24 09:35:29 -08:00
Jean-Baptiste Queru
29ead58259 am d2dd8652: Merge "Added generic hook for loading vendor specific tasks."
* commit 'd2dd86529982cd05b4010248cea368fbef763ef2':
  Added generic hook for loading vendor specific tasks.
2010-11-24 09:33:25 -08:00
Claes Elgemark
e22ad6784c Added generic hook for loading vendor specific tasks.
With this change it is possible for vendors to create rules that depend on
targets defined in Android.mk files.

This makes it easier to decouple functionality from the core buildsystem.
Very much as is done within the build git for tasks like creating SDK addon,
Generating eclipse .classpath file etc can then be done for vendors as well.

You can add targets that could perform poststeps on produced modules.
E.g. Do static verification or documentation on modules of a certain type.
You can e.g. create a target that would resign and upload all apks to a
binary repository.

Change-Id: Ic0fa7b60b919ede3c59fa2885d1fd4be1e928c04
2010-11-24 15:40:24 +01:00
Ying Wang
c5a07ce038 Pass extfs sparse image flag to the release tool.
Change-Id: Icb2a1c4fddb2b6153298ba1b849016aa3d792773
2010-11-17 17:45:36 -08:00
Ying Wang
542903a27b Product-configurable sparse ext images.
Change-Id: Ifd0ac14d7df331c9f6f1e3eee0722e07b4ab199a
2010-11-17 16:01:31 -08:00
Joe Onorato
25939e224e Set ro.build.characteristics to the value from PRODUCT_CHARACTERISTICS that's also passed to aapt.
Bug: 3144768
Change-Id: Ic1724c64d015de7a5c4f13709b91db51b8f10872
2010-11-09 08:53:01 -08:00
Jean-Baptiste Queru
9e5d44b796 am 57723b52: Merge 7b393fd1 from open-source master
* commit '57723b52cdb446c751ba8e65fa060e7a4faf4907':
  Add version_defaults.mk to be a prerequisite of build.prop
2010-11-04 10:57:36 -07:00
Jean-Baptiste Queru
57723b52cd Merge 7b393fd1 from open-source master
Change-Id: I5fee3ccbf7845d087e72848b4cec0198cd4afc26
2010-11-04 07:24:56 -07:00
Jean-Baptiste Queru
2042cabf71 am 6be29424: am 892ea1ea: Merge "build: Add spare size flag to mkyaffs2image"
* commit '6be29424c60cb5e17ce0aacb026c1cb88a62428b':
  build: Add spare size flag to mkyaffs2image
2010-11-03 10:59:25 -07:00
Chih-Wei Huang
75947ef5ef Add version_defaults.mk to be a prerequisite of build.prop
The version_defaults.mk defines variables that may affect
the content of build.prop.

Change-Id: Iabb82459949bb6e7a91829c5b485aad331c50b72
2010-11-03 18:33:46 +08:00
Ying Wang
462d26bd32 Only copy once even if the first matched src:dest pair appears more than once.
Change-Id: I9bef6172a1123518e97e04190fb857f9ee2c7582
2010-11-02 21:31:47 -07:00
Jean-Baptiste Queru
6be29424c6 am 892ea1ea: Merge "build: Add spare size flag to mkyaffs2image"
* commit '892ea1eaadfa5b57948bb66bd3432e06c58188e1':
  build: Add spare size flag to mkyaffs2image
2010-11-02 14:17:54 -07:00
Naseer Ahmed
53871886bd build: Add spare size flag to mkyaffs2image
Change-Id: Ib3a915ba5296d31f88cdc81e13da02f281dbdb9f
2010-11-02 08:59:39 -07:00
Ying Wang
2923c45d39 am 4038bbc4: am 09a00a67: Don\'t build update zip package if there is no kernel, or it\'s generic device.
Merge commit '4038bbc426776d8adc57d7c3c8123357b50b1615'

* commit '4038bbc426776d8adc57d7c3c8123357b50b1615':
  Don't build update zip package if there is no kernel, or it's generic device.
2010-10-21 13:45:14 -07:00
Ying Wang
4038bbc426 am 09a00a67: Don\'t build update zip package if there is no kernel, or it\'s generic device.
Merge commit '09a00a672bb18dccc97af6090739ea275c39d8a3' into gingerbread-plus-aosp

* commit '09a00a672bb18dccc97af6090739ea275c39d8a3':
  Don't build update zip package if there is no kernel, or it's generic device.
2010-10-20 14:28:52 -07:00
Ying Wang
09a00a672b Don't build update zip package if there is no kernel, or it's generic device.
Move the update package code block forward to be side by side with the ota package code,
so that they are built under the same condition.
Bug: 3116070

Change-Id: I8055909cc614bfbeee215d1b770a80f728e326ee
2010-10-20 14:12:21 -07:00
Xavier Ducrohet
f51f24a6ea Use the new sdk/build/tools.atree.
As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.

Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.

Change-Id: I9158501cd68783d593e49e5fdea7f17d19b0120f
2010-09-30 11:52:12 -07:00
Xavier Ducrohet
4b89f657ee am cbbab0d5: am ffd5087e: Use the new sdk/build/tools.atree.
Merge commit 'cbbab0d57dfd297233b7fb52b30e0a95f3b0129e'

* commit 'cbbab0d57dfd297233b7fb52b30e0a95f3b0129e':
  Use the new sdk/build/tools.atree.
2010-09-30 11:26:59 -07:00
Xavier Ducrohet
cbbab0d57d am ffd5087e: Use the new sdk/build/tools.atree.
Merge commit 'ffd5087ec81a281b1299048b4282dad593ccd703' into gingerbread-plus-aosp

* commit 'ffd5087ec81a281b1299048b4282dad593ccd703':
  Use the new sdk/build/tools.atree.
2010-09-30 08:52:16 -07:00
Ying Wang
421b46e0cb resolved conflicts for merge of 18c00c5c to master
Change-Id: I7f6870b654e24a268a14b9c47eb8d384993273f2
2010-09-28 10:45:54 -07:00
Ying Wang
18c00c5c6a am bb2b82bd: Merge "Fix userdata partition\'s ext4 mount point to data." into gingerbread
Merge commit 'bb2b82bd557b157fea5e280ef50ee782d15ac032' into gingerbread-plus-aosp

* commit 'bb2b82bd557b157fea5e280ef50ee782d15ac032':
  Fix userdata partition's ext4 mount point to data.
2010-09-27 18:05:22 -07:00
Ying Wang
026f1451ce Fix userdata partition's ext4 mount point to data.
Bug: 3041475
Change-Id: I07306cd9c90072626dfc132d6655618ae70e64be
2010-09-27 17:49:03 -07:00
Xavier Ducrohet
ffd5087ec8 Use the new sdk/build/tools.atree.
As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.

Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.

Change-Id: Ia0b0ea37f8a4904b3a7f7805a552eeb499a2c0ee
2010-09-27 15:51:32 -07:00
Ying Wang
e874e23a3c resolved conflicts for merge of dc45f86a to master
Change-Id: Icb49e58c1275c160715ba26d238337213e3877fe
2010-09-27 12:05:56 -07:00
Ying Wang
dc45f86af8 am 02352378: Remove emulator-based dexpreopt logic from the build system.
Merge commit '0235237805991b48831dc8add072a50c478b2fcb' into gingerbread-plus-aosp

* commit '0235237805991b48831dc8add072a50c478b2fcb':
  Remove emulator-based dexpreopt logic from the build system.
2010-09-27 11:52:45 -07:00
Ying Wang
0235237805 Remove emulator-based dexpreopt logic from the build system.
Change-Id: Ic96cbd1ebb9fa65aa85bf77f18a31913625d7e1c
2010-09-27 10:37:25 -07:00
Ying Wang
3efd768a0d resolved conflicts for merge of 9f28f0d7 to master
Change-Id: I8fbf8846fcb41ca6cb5f3e362484ec895fe7f4aa
2010-09-22 17:19:11 -07:00
Ying Wang
9f28f0d76e am e7874c43: Integrate dexpreopt into the build system.
Merge commit 'e7874c430895b9a4e631c89f1e7729da9264d167' into gingerbread-plus-aosp

* commit 'e7874c430895b9a4e631c89f1e7729da9264d167':
  Integrate dexpreopt into the build system.
2010-09-22 16:57:01 -07:00
Ying Wang
e7874c4308 Integrate dexpreopt into the build system.
Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
2010-09-22 16:51:53 -07:00
Doug Zongker
714633b13f am c0434ac8: add recovery.fstab as dependency so it triggers rebuild (do not merge)
Merge commit 'c0434ac8b504df8a2f2a2828dc9b3f804c3dda72' into gingerbread-plus-aosp

* commit 'c0434ac8b504df8a2f2a2828dc9b3f804c3dda72':
  add recovery.fstab as dependency so it triggers rebuild (do not merge)
2010-09-21 14:37:19 -07:00
Doug Zongker
c0434ac8b5 add recovery.fstab as dependency so it triggers rebuild (do not merge)
Make recovery image depend on the fstab file so it gets rebuilt when
fstab changes.  Add support for "emmc" fstab partition type to
edify_generator.

Change-Id: Ic5df4e86c24321bf7d82a644e3e4770352e4f64b
2010-09-21 14:26:36 -07:00
Doug Zongker
9ce0fb6e59 support for per-partition fs_type
Include the recovery.fstab file in the recovery image.  Remove the
global fs_type and partition_type values from the target-files
key/value dict, and parse the recovery.fstab file instead to find
types for each partition.

(Cherrypicked from gingerbread w/some edits to resolve conflicts.)

Change-Id: Ic3ed85ac5672d8fe20280dacf43d5b82053311bb
2010-09-21 14:13:11 -07:00
Doug Zongker
ed2d3f42d1 am 258bf46e: support for per-partition fs_type (do not merge)
Merge commit '258bf46ea6bb4f25d01fab1b783238589e5bbec4' into gingerbread-plus-aosp

* commit '258bf46ea6bb4f25d01fab1b783238589e5bbec4':
  support for per-partition fs_type (do not merge)
2010-09-21 11:37:10 -07:00
Doug Zongker
258bf46ea6 support for per-partition fs_type (do not merge)
Include the recovery.fstab file in the recovery image.  Remove the
global fs_type and partition_type values from the target-files
key/value dict, and parse the recovery.fstab file instead to find
types for each partition.

Change-Id: I35ee2dd0989441dc2a704b63c1b32e598049acb5
2010-09-21 09:55:29 -07:00
Doug Zongker
b984ae51e5 resolved conflicts for merge of 813ad17a to master
Change-Id: I3fc84babbbcab712c5e38a0c8b815115ba89375f
2010-09-16 23:13:11 -07:00
Doug Zongker
813ad17ad3 am 918ccff3: Merge "consolidate target_files metadata into one key-value file" into gingerbread
Merge commit '918ccff37260270d0eef3a3a7bfc2410c46d931a' into gingerbread-plus-aosp

* commit '918ccff37260270d0eef3a3a7bfc2410c46d931a':
  consolidate target_files metadata into one key-value file
2010-09-16 18:11:59 -07:00
Doug Zongker
37974731fc consolidate target_files metadata into one key-value file
Instead of separate files for recovery api version, tool extensions,
and mkyaffs2 options, put those all in the generic key-value file.

Change-Id: Ib642311632844d52e4895fd4747093fc7e86232d
2010-09-16 17:44:38 -07:00
Doug Zongker
f127eb709b resolved conflicts for merge of 2cb8d5eb to master
Change-Id: I3b1aec1aee7c6bfcee2e978b4755b2bae9e480c4
2010-09-16 12:38:40 -07:00
Doug Zongker
2cb8d5ebb2 am c77a9ad4: store user-visible image sizes in target-files
Merge commit 'c77a9ad444d49e2ad777678cf5671f0a94f44ffb' into gingerbread-plus-aosp

* commit 'c77a9ad444d49e2ad777678cf5671f0a94f44ffb':
  store user-visible image sizes in target-files
2010-09-16 12:32:56 -07:00
Doug Zongker
c77a9ad444 store user-visible image sizes in target-files
Do the yaffs-specific adjustments to image sizes in common.CheckSize,
instead of baking it into the image size stored in the target-files
package.  Remove the special fs_type flag and fold it into the
"info_dict" we have for saving key-value pairs from the build system.

Change-Id: I6e63f3330f6277d9a946b22e66cadeb51203ba14
2010-09-16 12:29:17 -07:00
Doug Zongker
df69250b75 am 8e8ff4ca: Merge "support for ext4/EMMC in target_files and OTA generation" into gingerbread
Merge commit '8e8ff4cad905a5b4eed7659152f075f9a5c038b1' into gingerbread-plus-aosp

* commit '8e8ff4cad905a5b4eed7659152f075f9a5c038b1':
  support for ext4/EMMC in target_files and OTA generation
2010-09-16 11:39:49 -07:00
Doug Zongker
c19a8d5590 support for ext4/EMMC in target_files and OTA generation
Move the image sizes into a more generic key-value file.  Make them
optional.  Add additional key/value pairs describing what kind of
filesystem the device uses.  Pass new fs-type-related arguments in
edify scripts when mounting and reformatting partitions.

Don't include all the init.*.rc files from the regular system in
recovery -- they aren't needed, and break recovery on some devices.

Change-Id: Ic1c651f754ed00ba1cffe8cf56c43f7f3b0ebfd7
2010-09-16 11:34:31 -07:00
Ying Wang
acff3464f8 am 671f5fb0: Don\'t increase partition size for ext4 user images. [DO NOT MERGE]
Merge commit '671f5fb09f3510c16f73049cad9d8d6d652eaad8' into gingerbread-plus-aosp

* commit '671f5fb09f3510c16f73049cad9d8d6d652eaad8':
  Don't increase partition size for ext4 user images. [DO NOT MERGE]
2010-09-16 10:59:41 -07:00
Ying Wang
671f5fb09f Don't increase partition size for ext4 user images. [DO NOT MERGE]
Change-Id: I5b82e6f7bd1c25ce3b1a4c16409b61aa1be7f71f
2010-09-16 10:54:03 -07:00
Doug Zongker
fbb920ad91 am bc843297: am 135a120e: remove the system board name from the build fingerprint
Merge commit 'bc84329757c6b79e1f10c418057e599ee106135c'

* commit 'bc84329757c6b79e1f10c418057e599ee106135c':
  remove the system board name from the build fingerprint
2010-09-15 17:54:07 -07:00
Ying Wang
0153446b79 am 6674ec30: am 659adc0b: Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
Merge commit '6674ec30bb92337e3bccb67bca53555a798a493f'

* commit '6674ec30bb92337e3bccb67bca53555a798a493f':
  Change "make PRODUCT-XXX-tests" to build only tests-build-target
2010-09-15 17:53:22 -07:00
Doug Zongker
bc84329757 am 135a120e: remove the system board name from the build fingerprint
Merge commit '135a120e3904d782623e4a3fc958ed098e8de384' into gingerbread-plus-aosp

* commit '135a120e3904d782623e4a3fc958ed098e8de384':
  remove the system board name from the build fingerprint
2010-09-15 13:14:26 -07:00
Doug Zongker
135a120e39 remove the system board name from the build fingerprint
Change-Id: I4cbbd03084b6ac24184b7475be3d34130094667d
2010-09-15 13:11:19 -07:00
Ying Wang
6674ec30bb am 659adc0b: Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
Merge commit '659adc0b54e40b3b194c84ad4ac8d2e775276e60' into gingerbread-plus-aosp

* commit '659adc0b54e40b3b194c84ad4ac8d2e775276e60':
  Change "make PRODUCT-XXX-tests" to build only tests-build-target
2010-09-15 11:58:41 -07:00
Ying Wang
db2cb63612 Change "make PRODUCT-XXX-tests" to build only tests-build-target
Change-Id: Ib1a1a7b09ea6f1c3eea84394dcd6e3ebcda81e1a
2010-09-14 16:32:12 -07:00
Ying Wang
9c76255031 Dist userdataimg and tests-zip-package for tests builds
So that the build server can run the following command to build and dist only the two packages:
make -j16 tests-zip-package userdataimage-nodeps dist showcommands TARGET_BUILD_VARIANT=tests TARGET_PRODUCT=passion

Change-Id: I03d7049582ec8537a389e80b7ecdcae6625222ea
2010-09-10 18:47:06 -04:00
Ying Wang
bcd1e1c858 am 570a0eef: Dist userdataimg and tests-zip-package for tests builds
Merge commit '570a0eeffb4c06084f21a058efb25271bb0cd1f6' into gingerbread-plus-aosp

* commit '570a0eeffb4c06084f21a058efb25271bb0cd1f6':
  Dist userdataimg and tests-zip-package for tests builds
2010-09-10 14:46:01 -07:00
Ying Wang
570a0eeffb Dist userdataimg and tests-zip-package for tests builds
So that the build server can run the following command to build and dist only the two packages:
make -j16 tests-zip-package userdataimage-nodeps dist showcommands TARGET_BUILD_VARIANT=tests TARGET_PRODUCT=passion

Change-Id: I03d7049582ec8537a389e80b7ecdcae6625222ea
2010-09-10 14:39:33 -07:00
Jean-Baptiste Queru
fff865f06f am 8f731bb2: am 0545c916: Revert "Allow properties with spaces in their values"
Merge commit '8f731bb2720475f652cc8c5849d564246b234bef'

* commit '8f731bb2720475f652cc8c5849d564246b234bef':
  Revert "Allow properties with spaces in their values"
2010-09-07 10:56:53 -07:00
Jean-Baptiste Queru
8f731bb272 am 0545c916: Revert "Allow properties with spaces in their values"
Merge commit '0545c9160d0d3dde4675184609cc7656de5558b0' into gingerbread-plus-aosp

* commit '0545c9160d0d3dde4675184609cc7656de5558b0':
  Revert "Allow properties with spaces in their values"
2010-09-07 10:53:46 -07:00
Jean-Baptiste Queru
0545c9160d Revert "Allow properties with spaces in their values"
This reverts commit de3bfade57.
2010-09-07 10:51:12 -07:00
Doug Zongker
a4a50996ac am c637db16: remove remaining amend support
Merge commit 'c637db16d83b2c248b1cf0122e2ba558ed95762c' into gingerbread-plus-aosp

* commit 'c637db16d83b2c248b1cf0122e2ba558ed95762c':
  remove remaining amend support
2010-09-03 12:39:15 -07:00
Doug Zongker
c637db16d8 remove remaining amend support
Remove the remaining (unused and untested) support for generating
amend scripts.  This means that you won't be able to OTA directly from
cupcake to gingerbread.

Change-Id: Iaf5295db92a42b336960d05295f48b67cb729337
2010-09-03 11:58:31 -07:00
Jean-Baptiste Queru
e0b19f60c0 am 54b8b436: am de3bfade: Allow properties with spaces in their values
Merge commit '54b8b436a380b053772110796642c7e5e6ba8e64'

* commit '54b8b436a380b053772110796642c7e5e6ba8e64':
  Allow properties with spaces in their values
2010-09-02 17:15:29 -07:00
Jean-Baptiste Queru
54b8b436a3 am de3bfade: Allow properties with spaces in their values
Merge commit 'de3bfade571033b01fbaccac2f0fdf7193e8d3ee' into gingerbread-plus-aosp

* commit 'de3bfade571033b01fbaccac2f0fdf7193e8d3ee':
  Allow properties with spaces in their values
2010-09-02 17:13:24 -07:00
Jean-Baptiste Queru
de3bfade57 Allow properties with spaces in their values
This way, such properties can be set in product definition files
instead of having to live in system.prop, which eliminates the need
for system.prop

Change-Id: I25d9665f65436df8215940e46380deb31b8161ba
2010-09-02 14:30:56 -07:00
Ying Wang
f5127dfc3d am 485bd44d: am d421f57d: Fix mkyaffs2image extra flags in the release tools.
Merge commit '485bd44d0d78f9f612075e17db1adb281741c84f'

* commit '485bd44d0d78f9f612075e17db1adb281741c84f':
  Fix mkyaffs2image extra flags in the release tools.
2010-08-25 21:21:43 -07:00
Ying Wang
485bd44d0d am d421f57d: Fix mkyaffs2image extra flags in the release tools.
Merge commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d' into gingerbread-plus-aosp

* commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d':
  Fix mkyaffs2image extra flags in the release tools.
2010-08-25 21:19:29 -07:00
Ying Wang
d421f57d22 Fix mkyaffs2image extra flags in the release tools.
Change-Id: I806e3e85ef89941edf04352331e25730c491c470
2010-08-25 20:39:41 -07:00
Ying Wang
1c19026961 am f11fc5f0: am fb0a347b: Disable building OTA package if there is no kernel.
Merge commit 'f11fc5f098ab8481887cbbbbb4246f63837b61c9'

* commit 'f11fc5f098ab8481887cbbbbb4246f63837b61c9':
  Disable building OTA package if there is no kernel.
2010-08-25 16:40:44 -07:00
Ying Wang
f11fc5f098 am fb0a347b: Disable building OTA package if there is no kernel.
Merge commit 'fb0a347b747a91173c8a9f845a0362e3f8a9701f' into gingerbread-plus-aosp

* commit 'fb0a347b747a91173c8a9f845a0362e3f8a9701f':
  Disable building OTA package if there is no kernel.
2010-08-25 16:13:08 -07:00
Ying Wang
fb0a347b74 Disable building OTA package if there is no kernel.
Change-Id: I9a10cba92dd7f9cccd8cca58a5fa2d3a8b4620eb
2010-08-25 16:06:06 -07:00
Ying Wang
3c3f69a123 resolved conflicts for merge of 480250d3 to master
Change-Id: Ic55950f4b92c7029fd2ff62976cba0d4d738fc23
2010-08-25 15:52:51 -07:00
Ying Wang
480250d3ae am 68bb6517: Show command lines run by releasetools.
Merge commit '68bb65177cc6839e985c0a54343f44494de61d62' into gingerbread-plus-aosp

* commit '68bb65177cc6839e985c0a54343f44494de61d62':
  Show command lines run by releasetools.
2010-08-25 15:40:29 -07:00
Ying Wang
68bb65177c Show command lines run by releasetools.
Change-Id: Ic204e6738781c191cd6cefefdb351f8a156b2309
2010-08-25 15:23:21 -07:00
Ying Wang
eb85d8d78e am eed6860d: am 4de6b5bf: Fix mkbootimg parameters for releasetools.
Merge commit 'eed6860d388f1761405d7165cb4d72e1f038b8a6'

* commit 'eed6860d388f1761405d7165cb4d72e1f038b8a6':
  Fix mkbootimg parameters for releasetools.
2010-08-25 15:13:07 -07:00
Ying Wang
eed6860d38 am 4de6b5bf: Fix mkbootimg parameters for releasetools.
Merge commit '4de6b5bfc89de95b18514e75329a2ec7491bebbd' into gingerbread-plus-aosp

* commit '4de6b5bfc89de95b18514e75329a2ec7491bebbd':
  Fix mkbootimg parameters for releasetools.
2010-08-25 15:04:45 -07:00
Ying Wang
4de6b5bfc8 Fix mkbootimg parameters for releasetools.
Change-Id: I6192743e9db415f5fe7f3b82081f8a82061254b3
2010-08-25 14:30:17 -07:00
Ying Wang
5177fcd308 am 2eed660c: am ffff0028: Pass pagesize to makebootimage.
Merge commit '2eed660c667550f1b810303b13ee0c7e84455bf0'

* commit '2eed660c667550f1b810303b13ee0c7e84455bf0':
  Pass pagesize to makebootimage.
2010-08-24 11:21:27 -07:00
Ying Wang
2eed660c66 am ffff0028: Pass pagesize to makebootimage.
Merge commit 'ffff0028ae9a83893f71efa370d283e2247bcdd4' into gingerbread-plus-aosp

* commit 'ffff0028ae9a83893f71efa370d283e2247bcdd4':
  Pass pagesize to makebootimage.
2010-08-23 13:52:18 -07:00
Ying Wang
ffff0028ae Pass pagesize to makebootimage.
Change-Id: I719d765245469921de105430fdd92d478ea48e82
2010-08-23 12:56:25 -07:00
Ying Wang
d3b973d897 am 065521be: Backport ext4 support from master [DO NOT MERGE]
Merge commit '065521be4fd6965058fbd599bb43fe13101fee7c' into gingerbread-plus-aosp

* commit '065521be4fd6965058fbd599bb43fe13101fee7c':
  Backport ext4 support from master [DO NOT MERGE]
2010-08-23 11:49:10 -07:00
Ying Wang
065521be4f Backport ext4 support from master [DO NOT MERGE]
ext4 support is needed by crespo.

Change-Id: I604cb9ada526ce8ba6b3648171ac1d614a5519a9
2010-08-23 11:34:40 -07:00
Ying Wang
d4ee2de1c3 am ad3cf5f8: Restore OTA for crespo. [DO NOT MERGE]
Merge commit 'ad3cf5f868fc36de0a4fa501f074d35a94496b27' into gingerbread-plus-aosp

* commit 'ad3cf5f868fc36de0a4fa501f074d35a94496b27':
  Restore OTA for crespo. [DO NOT MERGE]
2010-08-21 17:00:59 -07:00
Ying Wang
ad3cf5f868 Restore OTA for crespo. [DO NOT MERGE]
Change-Id: I2472942741bdb2e4fa5037883f6acbe6c4ca36c3
2010-08-21 16:58:06 -07:00
Jean-Baptiste Queru
ed91928a6c am 60d1ee3e: Better way to disable OTAs for crespo - DO NOT MERGE
Merge commit '60d1ee3e539e02ba701b9ff647fd23aca18f890d' into gingerbread-plus-aosp

* commit '60d1ee3e539e02ba701b9ff647fd23aca18f890d':
  Better way to disable OTAs for crespo - DO NOT MERGE
2010-08-20 19:22:51 -07:00
Jean-Baptiste Queru
60d1ee3e53 Better way to disable OTAs for crespo - DO NOT MERGE
OTAs need to be disabled for all products using crespo
hardware, not just a single one.

Change-Id: I961462e5e87bec8c59dafa13dbf0fdc96bab29ab
2010-08-20 19:19:55 -07:00
Ying Wang
13a019fe32 am 7daa9132: Disable OTA for crespo [DO NOT MERGE]
Merge commit '7daa91323139fa7c0435a07b0e3fad6056d0954b' into gingerbread-plus-aosp

* commit '7daa91323139fa7c0435a07b0e3fad6056d0954b':
  Disable OTA for crespo [DO NOT MERGE]
2010-08-20 17:13:56 -07:00
Ying Wang
7daa913231 Disable OTA for crespo [DO NOT MERGE]
Change-Id: I22c29226bb783fed34766e91d43edcf6e61a837f
2010-08-20 16:45:19 -07:00
Colin Cross
e0a40217df Pass partition sizes to make_ext4fs
Change-Id: I81e84ca02e4326989d25f7d43306c56cdc39348c
2010-08-03 14:50:41 -07:00
Colin Cross
9dd4ba88ee Add dependencies on make_ext4fs
Change-Id: I6e3a6ba33fd9e0ce35137f6e2f60d01521af4cb9
2010-08-03 14:50:32 -07:00
Ying Wang
778c2b6900 am 33c11ac3: am e1f37ba0: am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
Merge commit '33c11ac3f150a388ebf2df80a42b577c136282de'

* commit '33c11ac3f150a388ebf2df80a42b577c136282de':
  Dist apkcerts.txt for unbundled builds
2010-07-29 10:32:19 -07:00
Ying Wang
33c11ac3f1 am e1f37ba0: am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
Merge commit 'e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4' into gingerbread-plus-aosp

* commit 'e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4':
  Dist apkcerts.txt for unbundled builds
2010-07-29 10:30:13 -07:00
Ying Wang
e1f37ba0cf am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
Merge commit '55edb20e246e88afd841f63725c647132d9aca17' into gingerbread

* commit '55edb20e246e88afd841f63725c647132d9aca17':
  Dist apkcerts.txt for unbundled builds
2010-07-29 10:27:45 -07:00
Ying Wang
efb2168266 Dist apkcerts.txt for unbundled builds
Change-Id: Ic381d846f020dc43f48f43581c0db5721f2e36f7
2010-07-23 16:42:13 -07:00
Ying Wang
38d7f02c50 Trim spaces.
Change-Id: Ic3c592ca9457748acf7f2c5e99dccd3ed62f5ee4
2010-07-21 14:58:42 -07:00
Ying Wang
77c882ff88 Allow PRODUCT_PROPERTY_OVERRIDES to override default locale.
Change-Id: I5147d687750a50cfc186e99a9a8c88d3b2eb1692
If PRODUCT_PROPERTY_OVERRIDES has set default locale, buildinfo.sh skips setting them.
http://b/issue?id=2243115
2010-07-20 18:10:17 -07:00
Joe Onorato
c236f78c98 am 84843e68: am d7324cc3: Merge "Fix event-log-tags so we don\'t rebuild framework.jar because of an installclean." into gingerbread
Merge commit '84843e6843f0429f0729deb5670c22da0dcc5507'

* commit '84843e6843f0429f0729deb5670c22da0dcc5507':
  Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
2010-07-15 11:14:22 -07:00
Joe Onorato
84843e6843 am d7324cc3: Merge "Fix event-log-tags so we don\'t rebuild framework.jar because of an installclean." into gingerbread
Merge commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5' into gingerbread-plus-aosp

* commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5':
  Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
2010-07-15 11:10:29 -07:00
Joe Onorato
b751053151 Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
Produce an event logs tag file for everything we know about, in order
to properly allocate numbers.  Then produce a file that's filtered
for what's going to be installed.

Change-Id: Id0778aec0b4d045e8ff91ba2c9c8265e860eaba5
2010-07-14 10:22:54 -07:00
The Android Open Source Project
4be5c394c1 am 0fd96df4: merge from open-source master
Merge commit '0fd96df49ccecbf3628c95dabf3b94dfc27323e5'

* commit '0fd96df49ccecbf3628c95dabf3b94dfc27323e5':
  Refactor Stripper. Allow a stripper other than SOSLIM to be specified
2010-07-09 16:05:04 -07:00
The Android Open Source Project
0fd96df49c merge from open-source master
Change-Id: I40aa6f0f885ea30dd5f9918c323fa240a4830c38
2010-07-09 16:02:03 -07:00
The Android Open Source Project
2a582caba1 am 39a6a644: merge from open-source master
Merge commit '39a6a64471b28032d2037d9472d58dc0a77ef313'

* commit '39a6a64471b28032d2037d9472d58dc0a77ef313':
  Create systemtarball either with bz2 or gz
2010-07-09 15:00:57 -07:00
The Android Open Source Project
39a6a64471 merge from open-source master
Change-Id: Ic005b0772e144fc986fd3bacc67d5840b16efb81
2010-07-09 14:57:26 -07:00
The Android Open Source Project
8137a0b659 am d7fcea20: merge from open-source master
Merge commit 'd7fcea201db376e285aab74cefae29d2ac2b33df'

* commit 'd7fcea201db376e285aab74cefae29d2ac2b33df':
  Create boottarball just like systemtarball
2010-07-09 14:39:00 -07:00
The Android Open Source Project
d7fcea201d merge from open-source master
Change-Id: I0a6dc054775374db6b312feccebc46e26266b1fe
2010-07-09 14:36:12 -07:00
Bruce Beare
45ac434151 Refactor Stripper. Allow a stripper other than SOSLIM to be specified
Change-Id: I61137f5bb123dc5f610af9928ed3debdf85ba74d
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-09 12:16:46 -07:00
Bruce Beare
69ef5ce4f0 Create systemtarball either with bz2 or gz
Change-Id: I64e93872942e8dcad4a894a906be7912bb6da308
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-08 16:36:05 -07:00
Bruce Beare
52aac20307 Create boottarball just like systemtarball
Change-Id: I97640bc973ab1d115499878a63bff48f80b326ec
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-08 12:19:25 -07:00
The Android Open Source Project
6ab7b2d582 am d05a47c0: merge from open-source master
Merge commit 'd05a47c00ec3595b25ef9f46cd8b825cd35a8dca'

* commit 'd05a47c00ec3595b25ef9f46cd8b825cd35a8dca':
  Add $(TARGET_DEVICE_DIR)/system.prop to be a prerequisite
2010-07-07 13:48:12 -07:00
The Android Open Source Project
d05a47c00e merge from open-source master
Change-Id: I3b89fb8a09f7c3e1a23695572bca33751626542d
2010-07-07 13:46:08 -07:00
Chih-Wei Huang
4e3c6686d1 Add $(TARGET_DEVICE_DIR)/system.prop to be a prerequisite
If $(TARGET_DEVICE_DIR)/system.prop exists, it should be
a prerequisite of $(INSTALLED_BUILD_PROP_TARGET),
as the following rules state.

Change-Id: Ie395b6f08cef198c3f5c733a5b6ae5a458335a9c
2010-07-07 13:23:26 -07:00
Doug Zongker
b4c7d32cba support for ext4/EMMC in target_files and OTA generation
Move the image sizes into a more generic key-value file.  Make them
optional.  Add additional key/value pairs describing what kind of
filesystem the device uses.  Pass new fs-type-related arguments in
edify scripts when mounting and reformatting partitions.

Don't include all the init.*.rc files from the regular system in
recovery -- they aren't needed, and break recovery on some devices.

Change-Id: I40e49e65f0d76f735259e4b4fef882322cd739da
2010-07-01 15:30:11 -07:00
Ying Wang
205591981c resolved conflicts for merge of 34d37e50 to master
Change-Id: Ie7083ec2c87eb3fd28ea31002267f12ffe4426fa
2010-06-21 10:14:01 -07:00
Ying Wang
45113a7faa am 06898660: A nothing-to-do build should do nothing.
Merge commit '068986605b2afcd5e044b62f22ac6ecd5c15b519' into gingerbread

* commit '068986605b2afcd5e044b62f22ac6ecd5c15b519':
  A nothing-to-do build should do nothing.
2010-06-21 08:47:44 -07:00
Ying Wang
068986605b A nothing-to-do build should do nothing.
Before this CL, ota_from_target_files is always executed even with no new change.

Change-Id: I29d6aef3c60e5b0229551a3bf22f2d31cb41f219
2010-06-17 17:52:18 -07:00
Ying Wang
933abf15bc extfs support for img_from_target_files
Change-Id: Ie3df70426066bff467792b8528bc4528eb6afe15
2010-06-17 11:25:27 -07:00
Ying Wang
c79f4da0ef Move definition of build-userimage-ext-target to build/
Change-Id: I313dc26e8c497797c3321627e13ae298b1e37723
2010-06-16 14:58:50 -07:00
Guang Zhu
18b7556642 Squashed commit of the following (DO NOT MERGE):
commit 7401608f3b9b52b3348e32ec9fefe7583d6c2fa4
Author: Guang Zhu <guangzhu@google.com>
Date:   Fri Apr 23 11:54:37 2010 -0700

    collect emm meta files for emma instrumented build

    when doing 'make dist', with EMMA_INSTRUMENT on the coverage.em files
    generated for each module will be collected into one emma_meta.zip file

    Change-Id: I382c39a97005e6cae5c79ad7eaef1c8857f658af

commit 8376d70938f6507d54b66fe5832a637aa883974e
Author: Guang Zhu <guangzhu@google.com>
Date:   Wed Mar 10 15:48:03 2010 -0800

    enhancement for building app with emma code coverage

    * global filter to avoid applying instrumentation on emma classes
    * remove local variable information at dex step instead of compile time

    Change-Id: If04c27bc717f34816077a98ead9ceb0dbcbb0d2f

Change-Id: I971bd0f291bede2568b21347247d37a7d035c661
2010-05-18 15:26:22 -07:00
Colin Cross
144b028eac Fix dependencies on ext2 user images
Change-Id: I0efca76ef0c38db40c41be573457b788b7b8d451
2010-05-10 13:24:29 -07:00
Colin Cross
0a7b2c5c13 build: Add support for ext3 and ext4 images
Change-Id: I63b36bfa0036419df92a60a1f8f7b0a7e6b1b62e
2010-05-07 14:51:34 -07:00
Ying Wang
a37a2cb231 Dist only if the goal is to be built
Change-Id: I1b794f36a6dc39ce68cc990b967d2d55118c92ca
http://b/issue?id=2635603
2010-04-28 12:59:51 -07:00
Guang Zhu
0198d6ebb4 collect emm meta files for emma instrumented build
when doing 'make dist', with EMMA_INSTRUMENT on the coverage.em files
generated for each module will be collected into one emma_meta.zip file

Change-Id: I382c39a97005e6cae5c79ad7eaef1c8857f658af
2010-04-26 11:26:55 -07:00
Raphael
9ca1628e3f Support building Windows SDK under Linux.
- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.

- Makfile: include windows_sdk.mk when needed to build a Windows SDK.

- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)

(Merge master Change I9d08d0df)
2010-04-23 13:17:23 -07:00
Raphael
3d224a0fc9 Support building Windows SDK under Linux.
- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.

- Makfile: include windows_sdk.mk when needed to build a Windows SDK.

- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)

Change-Id: I9d08d0df598b8a7292532d23c55f48101a95a240
2010-04-23 10:06:41 -07:00
Doug Zongker
6717059ccc don't use the -m option when building OTA packages any more
The -m option no longer exists; we only support one OTA package script
language in gingerbread.

Change-Id: I9b532a30f8c3b297b8ffdb2a570a24db37f056d1
2010-04-21 14:53:07 -07:00
Ying Wang
139e33243b Add symbols.zip and build.prop to sdk dist.
Change-Id: I667f5ef847a6e8e78c6b3df5c2b092bb5d863955
http://b/issue?id=2394164
2010-03-31 17:29:04 -07:00
Ying Wang
910dcbebc0 Cherry-pick 6f1c75849c4b101b55ae624755e43293724ce76e from eclair
Change-Id: I21a69669935d838595b2fa01c5be10e6c1975da9
2010-03-24 23:22:33 -07:00
Doug Zongker
283e2a1e1b store filesystem config info in target files at build time
Store a dump of the desired uid/gid/mode for every system file in the
target_files zip.  Modify ota_from_target_files to use this stored
information when it is available, instead of running fs_config from
the current client (which might be out of sync from the one where the
target_files zip was built).

b/2516887 - New android_filesystem_config.h needed

Change-Id: I8409a0265d1d50daad9c2bc033c99b74b8931b20
2010-03-15 18:04:15 -07:00
The Android Open Source Project
d2e571cb55 merge from open-source master
Change-Id: I9fedeb014c946b53bfdd424b00c0cb5fc08f8333
2010-03-08 17:16:23 -08:00
Jean-Baptiste Queru
518ce5753a De-dupe PRODUCT_COPY_FILES
This allows to explicitly deal with situations where we
want to use PRODUCT_COPY_FILES to manage overrides.

Change-Id: I2f87862e19b973f090099f335e9bdeb0c9f3bfe9
2010-03-01 16:22:10 -08:00
Jean-Baptiste Queru
75e3264867 Don't build OTA package for aosp_emulator_us
This allows "make dist" to work on that configuration.

A better fix would be to allow each product to specify
whether it's an emulator target or a device target, and
to adapt to that, but that'd be a lot more intrusive.

Change-Id: I47708025204a4991466abceb1708a3020a543238
2010-02-24 15:59:36 -08:00
Doug Zongker
7e2f13b43a build the event-log-tags file for the simulator
Change-Id: Idfbc8257e5e3651fe92649d59305f0e24ba60c91
2010-02-16 16:01:43 -08:00
Dima Zavin
1181898e54 core: pass nand page size to mkyaffs2image based on BOARD_NAND_PAGE_SIZE boardconfig var
Change-Id: I6feefba15eb1562161e38df03223cb2fba4eb7ee
Signed-off-by: Dima Zavin <dima@android.com>
2010-02-12 15:31:36 -08:00
Doug Zongker
f6a53aa5f2 add "EXTERNAL" as special value of LOCAL_CERTIFICATE
Setting LOCAL_CERTIFICATE to "EXTERNAL" now marks an apk (either a
prebuilt or otherwise) as needing the default test key within the
system, but one that should be signed after the target_files is
produced but before sign_target_files_apks does the rest of the
signing.  (We use this to ship apps on the system that are signed by
third parties, like Facebook.)
2009-12-15 15:06:55 -08:00
Doug Zongker
672b05c47c make build depend on event-log-tags file
Oops, I forgot to make the build actually require the event-log-tags file.
2009-12-04 10:05:20 -08:00
Doug Zongker
9bd4962af8 break up event-log-tags; generate java source files with constants
Construct the /system/etc/event-log-tags file by unioning together any
*.logtags files included in LOCAL_SRC_FILES throughout the system (with
appropriate error checking for dup tag numbers, etc.)

For java packages, generate a java source file from the logtags file for
that package that contains static integer constants for each tag name.
2009-12-03 16:47:52 -08:00
Xavier Ducrohet
258b2b4504 am 1ae98804: Change where makefile looks for sdk_clean.sh
Merge commit '1ae988040777f88f766fc421af79a61175e917af' into eclair

* commit '1ae988040777f88f766fc421af79a61175e917af':
  Change where makefile looks for sdk_clean.sh
2009-11-18 17:11:53 -08:00
Xavier Ducrohet
1ae9880407 Change where makefile looks for sdk_clean.sh 2009-11-17 15:10:41 -08:00
David 'Digit' Turner
2edfb71d01 Support secondary CPU ABI in build.prop
BoardConfig.mk typically defines TARGET_CPU_ABI to the name of the
native machine code CPU ABI supported by the target device. For example,
existing devices today use the value 'armeabi' corresponding to an
ARMv5TE instruction set with soft-float implementation.

This patch allows this file to also define TARGET_CPU_ABI2 to name
a secondary (minor) CPU ABI also supported by the device. This is useful
when the main ABI is ARMv7-A (identified as 'armeabi-v7a') which also
supports ARMv5TE. Such devices should have TARGET_CPU_ABI defined to
'armeabi-v7a' and TARGET_CPU_ABI2 defined to 'armeabi'.

TARGET_CPU_ABI2 will be translated into the ro.product.cpu.abi2 property
in build.prop. This value will be used by the PackageManager to handle
"fat-binaries" generated with the NDK.
2009-11-06 15:12:00 -08:00
Doug Zongker
c18736b1a7 remember device-specific releasetools extensions in target-files
Store the location of the releasetools extensions in the target-files
zip, and make ota_from_target_files use that stored location by
default (though it can still be overridden with -s if desired).
2009-09-30 09:20:32 -07:00
Doug Zongker
ed96e88850 resolved conflicts for merge of 6dd2ae02 to eclair 2009-08-26 09:37:07 -07:00
Doug Zongker
6dd2ae02c1 turn down allowed image size
yaffs appears to reserve 5 blocks on the partition for itself.
Account for this when computing the maximum allowable image size.
2009-08-25 18:05:02 -07:00
Doug Zongker
8510a1e0d7 use *_PARTITION_SIZE instead of *_MAX_SIZE
Make BoardConfig.mk store the size of the partition rather than the
maximum size of the image that can be flashed there, because the
function used to do the conversion isn't available when BoardConfig.mk
is read any more.
2009-08-10 09:03:16 -07:00
Brian Swetland
630b7d3ffa build: do not attempt to build recovery.img for TINY_ANDROID builds
Signed-off-by: Brian Swetland <swetland@google.com>
2009-08-07 18:09:44 -07:00
Sriram Raman
7b02ff0fdc am 1e96ac84: Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed. Don\'t have to re-specify exclusion list for the patch file construction.
Merge commit '1e96ac8430da922332e4c85e7eed0e95442ff2ce'

* commit '1e96ac8430da922332e4c85e7eed0e95442ff2ce':
  Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.
2009-07-24 16:09:20 -07:00
Sriram Raman
1e96ac8430 Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.
Don't have to re-specify exclusion list for the patch file construction.
2009-07-24 14:24:35 -07:00
Android Git Automerger
9c3b0d58c8 Merge commit '66ae61670d3ea69dd1cf72cf529c29654c07405e' 2009-07-24 12:48:15 -07:00
Android Git Automerger
c41bda63a3 Merge commit '3455a3d4a1b5f59ccbcc2ac7268d11b03861c229' 2009-07-24 12:47:48 -07:00
Android Git Automerger
dabee36b79 Merge commit 'b003d89ee3a6d39a0ad3ca6e9c8a61f39ef3b92a' 2009-07-24 12:47:28 -07:00
Android Git Automerger
cb69dabbdd Merge commit '22bc517cdfb6b7ee5f90f61de425516c1d7b0245' 2009-07-24 12:47:17 -07:00
Android Git Automerger
72e108a1d4 Merge commit '7a7cd0d8a3ee6d061d7b505583cb791eec6124f5' 2009-07-24 12:47:03 -07:00
Android Git Automerger
358a48e12a merge 73ef8257ce from donut (resolved conflicts) 2009-07-24 12:46:51 -07:00
Sriram Raman
b11428e53b Fix generic-userdebug build (don't build OTA for this target). 2009-07-24 12:02:28 -07:00
Android (Google) Code Review
ef9f4ea0b8 am 4d7c4348: Merge change 8295 into donut
Merge commit '4d7c4348077b0f1a713ebffe59b458a5d95fba11'

* commit '4d7c4348077b0f1a713ebffe59b458a5d95fba11':
  applypatch changes for patching recovery image
2009-07-23 23:58:04 -07:00
Doug Zongker
3455a3d4a1 don't try to build recovery patch in generic build 2009-07-23 20:06:57 -07:00
Doug Zongker
b003d89ee3 make path explicit when running imgdiff
The build servers don't run "lunch" before building, so they don't
have the same path as everyone else.  Explicitly set it when running
imgdiff.
2009-07-23 18:48:38 -07:00
Doug Zongker
22bc517cdf fix imgdiff/bsdiff dependencies
These should be regular dependencies, not order-only ones.
2009-07-23 18:27:43 -07:00
Doug Zongker
7a7cd0d8a3 fix system size calculation for SDK build
The SDK build doesn't have recovery, don't try to generate a patch or
include it in the system image size calculation.  Also there's a
dependency on bsdiff that was omitted.
2009-07-23 17:58:54 -07:00
Doug Zongker
73ef8257ce use a binary patch to install recovery from system
Instead of storing the whole recovery image in system in order to
flash it on first boot, we instead use an imgdiff patch from the boot
image to create the recovery image.  This is substantially smaller
since it effectively only stores the recovery binary and UI images
(the kernel and the init binary are identical to that of the boot
image).

This change modifies the OTA-building script to create and install
these patches, and changes the calculation of the system image size in
the Makefile to reflect the new scheme.
2009-07-23 15:12:53 -07:00
Doug Zongker
6c770467fb applypatch changes for patching recovery image
Make some changes needed to applypatch in order to store the recovery
image in the system partition as a binary patch relative to the boot
image:

  - make applypatch use shared libraries, so it's smaller.  It will
    need to be on the main system so it can install the recovery
    image.  Make an applypatch_static binary for use in recovery
    packages (still needed for updating cupcake devices to donut).

  - output the results of patching to an in-memory buffer and write
    that to the partition; there's no convenient /tmp for us to us.
    (This should be basically a no-op in recovery, since /tmp is a
    ramdisk anyway.)
2009-07-22 19:15:59 -07:00
Doug Zongker
b6d89448a9 am 8cebf1ff: fix mislaid \'if\' in recovery
Merge commit '8cebf1ff7836a5dc365e49f7a14d7546a651d9c7'

* commit '8cebf1ff7836a5dc365e49f7a14d7546a651d9c7':
  fix mislaid 'if' in recovery
2009-07-07 17:19:29 -07:00
Doug Zongker
8cebf1ff78 fix mislaid 'if' in recovery
When I moved the building of the recovery image upwards in the file, I
moved an 'endif' surrounding it but not the matching 'if'.  How did
this ever work?
2009-07-07 17:14:25 -07:00
Doug Zongker
97f696cdaa am 4647f12a: fix image size tests
Merge commit '4647f12a4ff9dc54247184f17ff3de1cc423f213'

* commit '4647f12a4ff9dc54247184f17ff3de1cc423f213':
  fix image size tests
2009-07-07 16:43:16 -07:00
Doug Zongker
4647f12a4f fix image size tests
There are currently two errors in the way we test the size of built
images against the size of the partition on the hardware:

- the limits in BoardConfig.mk are set with the data size only, but
  images contain an extra 64 bytes per 2048-byte page.  This means we
  think the partition is about 1/32 smaller than it really is.

- when we deliver a build via OTA, the system partition ends up with
  one more file than when it's flashed via fastboot.  That file is a
  copy of the recovery image.  In order to be able to OTA a build, we
  need to make sure the system partition has enough room for all the
  system files plus the recovery image as well.

For the kila system partition, these errors are roughly the same order
of magnitude -- about 2MB, one in the "safe" direction, one in the
"unsafe" direction.  This change fixes both to give us a more accurate
notion of how close we are to the limit.

Make the build emit a warning (but not fail) when the size is within
32kb of the limit.

Also, include the values of the partition size limits in an info file
in the target-files package, so post-processing tools can use them
without parsing the BoardConfig.mk file.
2009-07-02 12:21:43 -07:00
Doug Zongker
659fc55e44 pass correct -s and -m options to release tools
When building an OTA package, TARGET_RELEASETOOLS_EXTENSIONS can be
set (in BoardConfig.mk) to specify where the device-specific
releasetools code is located.  (The default location is the common
directory for the device's vendor.)  The TARGET_OTA_SCRIPT_MODE can be
used to override the default script mode ("auto") for a particular
device.
2009-06-23 09:54:52 -07:00
Doug Zongker
e01100c7ac generalize the definition of a "radio image"
Non-HTC devices may have multiple files constituting their "radio
image".  Generalize the INSTALLED_RADIOIMAGE_TARGET variable a bit:
initially define it as empty, then let AndroidBoard.mk files add to
it.  Provide a convenience function add-radio-image for them to call
to add files.  Put all those files into the target_files zip for use
in OTA and fastboot package construction.

Note that for HTC devices, this changes the name of the radio image in
the target_files zip:  instead of "RADIO/image" it will be
"RADIO/radio.img".  Tools that use the target_files zip will need to
be changed.
2009-06-22 17:46:19 -07:00
Doug Zongker
ac4920a90b resolved conflicts for merge of c494d7ce to master 2009-06-18 13:42:20 -07:00
Doug Zongker
c494d7cee8 generate OTA packages that use edify
Split the details of generating script syntax into a generator class:
one for amend (whose output should be equivalent to the current
output), and one for edify.

Fix 'otatools' build rule to build imgdiff.
2009-06-18 13:19:07 -07:00
Doug Zongker
d6fb2d40b5 am 602a84e0: fix releasetools for non-linux architectures
Merge commit '602a84e0bbf1807a9403cfa50184241f6fc035c4'

* commit '602a84e0bbf1807a9403cfa50184241f6fc035c4':
  fix releasetools for non-linux architectures
2009-06-18 10:47:13 -07:00
Doug Zongker
602a84e0bb fix releasetools for non-linux architectures
The ota and img building scripts contained some hardcoded 'linux-x86'
paths.  Remove and replace with a slightly redefined -p option.
Modify Makefile to pass correct -p when building.
2009-06-18 10:43:55 -07:00
Android (Google) Code Review
daadaaa308 am 1a28c1a4: Merge change 4541 into donut
Merge commit '1a28c1a4c1ad0c4adf0c63bb36f47394e9509360'

* commit '1a28c1a4c1ad0c4adf0c63bb36f47394e9509360':
  remember in the target-files package what version of the API recovery uses
2009-06-17 21:49:40 -07:00
Doug Zongker
b1134dd049 remember in the target-files package what version of the API recovery uses 2009-06-17 17:09:40 -07:00
Doug Zongker
38a649f873 handle BOARD_KERNEL_BASE in releasetools
Some devices define a BOARD_KERNEL_BASE argument which must be given
as an argument to mkbootimg when building a bootable image.  Store the
value of this var (if any) in the target-files zip and use it when
building images.
2009-06-17 09:07:09 -07:00
The Android Open Source Project
157064f0b6 manual merge of dddd957c, explicitly list SDK image dependencies
Merge commit 'dddd957c'
2009-06-15 22:21:14 -07:00
Doug Zongker
dddd957c74 explicitly list SDK image dependencies
The SDK build used to have the update package as a dependency, in
order to force various image files to be built.  Now the the update
package can't be built for sdk-eng, list the individual images needed
instead.
2009-06-15 21:25:32 -07:00
The Android Open Source Project
93521c42e4 manual merge of 367910fc, don't build ota or update packages for sdk or sim
Merge commit '367910fc'
2009-06-15 19:29:10 -07:00
Doug Zongker
367910fc6d don't build ota or update packages for sdk or sim 2009-06-15 18:56:51 -07:00
The Android Open Source Project
61ceba259d manual merge of 37c0e274, fix building of otacerts.zip
Merge commit '37c0e274'
2009-06-15 18:12:44 -07:00
Android (Google) Code Review
6be991f074 am cf348b97: Merge change 4232 into donut
Merge commit 'cf348b97bdb52b7ffe7be0d17318b1fda425a211'

* commit 'cf348b97bdb52b7ffe7be0d17318b1fda425a211':
  use releasetools scripts to build update and OTA packages
2009-06-15 17:56:59 -07:00
Doug Zongker
37c0e274d1 fix building of otacerts.zip
Was using a variable which was only defined inside the rule, outside
the rule.  Change to use the correct variable.
2009-06-15 15:36:16 -07:00
Doug Zongker
8678df4c06 use releasetools scripts to build update and OTA packages
Use the python scripts in build/tools/releasetools (that are used to
build signed releases) to build packages within the Makefile as well.
2009-06-15 14:30:14 -07:00
Android (Google) Code Review
622a564e8f am 03474237: Merge change 4054 into donut
Merge commit '0347423753fb5d7207aa1ea93a8429f59468eb41'

* commit '0347423753fb5d7207aa1ea93a8429f59468eb41':
  build 'updater' binary for use in OTA packages
  Add VpnServices to PRODUCT_PACKAGES.
2009-06-14 21:12:39 -07:00
Doug Zongker
a406c1e7a1 build 'updater' binary for use in OTA packages 2009-06-12 16:57:08 -07:00
Doug Zongker
f55791f720 am 8b70e8c6: use minigzip instead of system gzip in the build
Merge commit '8b70e8c6574e6e6e80aaa84fe1a9426995fa0a78'

* commit '8b70e8c6574e6e6e80aaa84fe1a9426995fa0a78':
  use minigzip instead of system gzip in the build
2009-05-27 15:06:53 -07:00
Doug Zongker
8b70e8c657 use minigzip instead of system gzip in the build
Use zlib's minigzip utility, built as part of our source tree, instead of
whatever installation of GNU gzip happens to be on the user's machine.
Using zlib's deflater, which is nicely available as a library (unlike
GNU gzip's deflater) will ultimately let us do binary patches to the
boot and recovery images.
2009-05-27 14:27:45 -07:00
Android (Google) Code Review
4afb4f20fc am 3026e96d: Merge change 2245 into donut
Merge commit '3026e96dcea7893d762d3ad1532c3775dfe01b60'

* commit '3026e96dcea7893d762d3ad1532c3775dfe01b60':
  Define TARGET_CPU_ABI for finding native code in .apks
2009-05-22 16:55:41 -07:00
Dianne Hackborn
ecc70d705a Define TARGET_CPU_ABI for finding native code in .apks 2009-05-22 14:54:07 -07:00
Robert Greenwalt
fbd10d940d Add PRODUCT_DEFAULT_WIFI_CHANNELS build var.
Allows the build to specify the default number of allowed
WIFI channels.  Part of the fix for 1625953.
2009-05-21 18:46:57 -07:00
Dianne Hackborn
9537884b0d Add new property for dev codename, update version to Donut. 2009-05-08 13:03:08 -07:00
Dima Zavin
6ea3b8856d core: Recovery image should have the custom kernel base as well.
Signed-off-by: Dima Zavin <dima@android.com>
2009-05-07 21:10:41 -07:00
Dima Zavin
1e0847c2fc core: Allow the board config to specify the kernel base address for mkbootimg
Signed-off-by: Dima Zavin <dima@android.com>
2009-05-07 19:50:51 -07:00
Joe Onorato
7b2845ab1a Don't rebuild the NOTICE files when building with mm, mmm, etc. 2009-04-30 13:52:50 -07:00
Joe Onorato
03fbe40d53 AI 145850: am: CL 145512 SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145850
2009-04-13 08:31:16 -07:00
Joe Onorato
64d85d0d82 AI 145618: am: CL 145333 Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
  Implement SDK add-ons in the build system.
  - Add an option to use the standard javadoc doclet instead
  of droiddoc, since droiddocs non-sdk templates aren't
  ready for prime time.
  - Add the notion of a stubs for a library.  It's only
  implemented for java libraries, but when we do native
  libraries in the NDK or sdk-addons, it will work there too.
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145618
2009-04-09 19:31:12 -07:00
Doug Zongker
934de9b758 AI 144143: Define OTA_PUBLIC_KEYS to be the test keys in the otapackage
target as well.

Automated import of CL 144143
2009-04-02 01:15:57 -07:00
Doug Zongker
17c83cf22c AI 144130: Don't build OTA package keys into the recovery binary; read
them from an external file in the recovery image.  Use the
  test-keys for all builds.

Automated import of CL 144130
2009-04-01 15:48:46 -07:00
Sriram Raman
7b64124f0b Automated import from //branches/donutburger/...@142410,142410 2009-03-24 22:40:59 -07:00
The Android Open Source Project
88b607994a auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
The Android Open Source Project
05806d7af6 auto import from //depot/cupcake/@135843 2009-03-03 18:28:14 -08:00
The Android Open Source Project
094268cf8c auto import from //depot/cupcake/@132589 2009-03-03 14:03:52 -08:00
The Android Open Source Project
a9b2249753 auto import from //depot/cupcake/@137055 2009-03-02 22:54:15 -08:00
The Android Open Source Project
4d23ccc023 auto import from //branches/cupcake/...@132569 2009-02-20 07:38:28 -08:00
The Android Open Source Project
41977d7cd2 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:29 -08:00
The Android Open Source Project
475fa12ade auto import from //branches/cupcake/...@130745 2009-02-10 15:43:57 -08:00
The Android Open Source Project
35cfb08c58 auto import from //branches/cupcake/...@127436 2009-01-22 00:13:40 -08:00
The Android Open Source Project
ed18741e07 auto import from //branches/cupcake/...@127101 2009-01-20 14:03:55 -08:00
The Android Open Source Project
66339ad5ce auto import from //branches/cupcake/...@126645 2009-01-15 16:12:07 -08:00
The Android Open Source Project
dcc08f073b Code drop from //branches/cupcake/...@124589 2008-12-17 18:03:49 -08:00
The Android Open Source Project
b6c1cf6de7 Initial Contribution 2008-10-21 07:00:00 -07:00