Commit graph

330 commits

Author SHA1 Message Date
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