p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,635 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

2023 Commits

Author SHA1 Message Date
Ying Wang 486be82198 Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds 
Bug: 5430740
- Remove nonexistent names in PRODUCT_PACKAGES.
- Push down bluetooth-health, hostapd and wpa_supplicant.conf to
generic_no_telephony.mk and large_emu_hw.mk because they are not needed
by sdk builds.
- Remove core.mk from generic_armv5.mk and generic_x86.mk because they
  already inherit from generic.mk.

Change-Id: Ie44b95f1cae7ed0d4cf827ffce6a91d41902434d
 2011-10-10 13:10:13 -07:00
Ying Wang 32ef58e2c1 Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use. 
Bug: 5433204
Change-Id: Id88c21f8d1991d8cbcc5bb7dae784aa72dc4becf
 2011-10-10 09:54:47 -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
Doug Zongker a4bbf24afd am f9ede7e9: Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom 
* commit 'f9ede7e925a668cc8c0b44cb69c0795cb6c8c896':
  sign non-PRESIGNED prebuilt apks
 2011-10-05 09:58:05 -07:00
Doug Zongker f9ede7e925 Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom 2011-10-05 09:55:58 -07:00
Doug Zongker 08d79c12de sign non-PRESIGNED prebuilt apks 
Since dev keys can now vary per device, we can't assume they are
checked in with the correct signature.

Change-Id: I7577a3a6bd98d005c15936c99b2944acc4412798
 2011-10-05 09:49:24 -07:00
Ying Wang 0611aeedeb Merge "Install path support for vendor modules." into ics-factoryrom 2011-10-05 09:07:53 -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 2a71850eb3 Merge "Generate an empty target if there is no packages" 2011-09-27 11:31:12 -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
David 'Digit' Turner becc3da915 resolved conflicts for merge of 2f2882a0 to master 
Change-Id: Ia07eb9d022a8036c2b1674c591514740aa0d4596
 2011-09-23 11:44:29 +02:00
David 'Digit' Turner 2f2882a04e am fdb13fcc: am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread 
* commit 'fdb13fccfecdf526549ad453a20e8136253edb51':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
 2011-09-22 23:01:17 -07:00
David 'Digit' Turner fdb13fccfe am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread 
* commit '0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
 2011-09-22 22:59:07 -07:00
David 'Digit' Turner 0cc5e1ef45 Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread 2011-09-22 22:58:04 -07:00
Dianne Hackborn 228fd69eaf Merge "Let's call MR0 4.0.1." 2011-09-21 18:11:44 -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
Dianne Hackborn 7766ea2884 Let's call MR0 4.0.1. 
Change-Id: Ie55012702e2cfb1eb247941e8b73519ad9b5c547
 2011-09-21 15:25:37 -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
Ying Wang 43e18e0d7b Install path support for vendor modules. 
Bug: 5284764
Set "LOCAL_PROPRIETARY_MODULE := true" to install module to vendor
partition.

Change-Id: I9acdda6b2ff3142628b9849ea534b3ec288545a0
 2011-09-21 13:32:36 -07:00
Ying Wang 99732e2c59 am 04c48584: Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom 
* commit '04c485843f9fce0f66d18cb96e1051b7382b1f38':
  Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.
 2011-09-20 20:04:50 -07:00
Ying Wang 415f1f6613 Merge "Install path support for vendor modules." 2011-09-20 20:02:27 -07:00
Ying Wang 04c485843f Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom 2011-09-20 20:02:17 -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
Dianne Hackborn 14169bcea8 New LOCAL_SDK_RES_VERSION config var. 
This allows an app to target a different SDK level for its resources
than it uses for its Java code.  This is useful because it is generally
safe to use various newer symbols like attribute names, as older versions
of the platform will simply ignore them.

Change-Id: Ida19ec9f259c4ea70de846e9a63546e263b1c91e
 2011-09-19 10:42:04 -07:00
Raphael 514c487dcb Enable building sdk/avdlauncher in the Win SDK. DO NOT MERGE. 
Required by Change-Id Ic651e3c3 in sdk.git

Cherry-pick from master c36df7b12b

Change-Id: Ic51ad7df01ce1bc926ba69f8a031a060edbf0bd1
 2011-09-16 21:35:42 -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 cf29731eea Merge "Don't strip llvm-rs-rc in core/Makefile" 2011-09-16 12:25:07 -07:00
Raphael aae801fb1c Merge "Enable building sdk/avdlauncher in the Win SDK." 2011-09-16 10:59:41 -07:00
Raphael c36df7b12b Enable building sdk/avdlauncher in the Win SDK. 
Required by Change-Id Ic651e3c3 in sdk.git

Change-Id: I97f389d052ba9abf1c40547abbc6d7c164bdf405
 2011-09-16 09:20:03 -07:00
Ying Wang c36b450ab1 Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries. 
So that prebuilt shared libraries can be referenced with the module name
in other module's Android.mk.

Change-Id: I4c4b471696642694b805b71dd7605b91724ad924
 2011-09-15 16:13:39 -07:00
Ying Wang 704c0c9fca Use LOCAL_REQUIRED_MODULES to add dependency of installed shared libraries 
Bug: 5200343
Before this change the build system assumes that shared libraries will
be installed to $(TARGET_SHARED_LIBRARIES). That's not true if the
module uses custom LOCAL_MODULE_PATH.
With this change we defer the evaluation of the dependency to after all
Android.mks are loaded and all modules have their installed path
determined.

Change-Id: Ib6628ed44154a90e8668d31691fbbac67125be6c
 2011-09-15 14:05: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
Ed Heyl 58dcc788b9 Merge commit '4d7ddab160ba29247225e11c2092dcfd68bd6baf' into ics-factoryrom 2011-09-15 06:49:04 -07:00
Ed Heyl b8fe43be28 default version 
Change-Id: I6ca2be74916b5bebffd910fdbcbefe158fdfc562
 2011-09-15 04:54:20 -07:00
Dianne Hackborn 4d7ddab160 Hello, Android 4.0. 
Change-Id: I0d775bc81e1fb1c3ca0151b15a582035109dc5b5
 2011-09-14 13:52:02 -07:00
Ying Wang 8f77936dd8 Install path support for vendor modules. 
Bug: 5284764
Set "LOCAL_PROPRIETARY_MODULE := true" to install module to vendor
partition.

Change-Id: I1301acc10664a12e313f3b868d9fd6400ac8b133
 2011-09-13 13:57:26 -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
Brian Muramatsu 164285e05f am 8658fa51: am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5 
* commit '8658fa51d15290cf43178d0633b53f11ff08a4aa':
  Disable Dexpreopt for generic_arm5
 2011-09-09 12:04:27 -07:00
Ying Wang 8e5b540cff am 41346ae4: am ba35b2d6: resolved conflicts for merge of 162991be to gingerbread-plus-aosp 
* commit '41346ae4077c7dee66a7c04dc91714569dca9303':
  Allow uninstallable APPs.
 2011-09-08 14:48:38 -07:00
Ying Wang d62de0f884 Merge "Provide LOCAL_RENDERSCRIPT_TARGET_API override." 2011-09-08 14:26:28 -07:00
Ying Wang f1054bf22e Merge "Discard hidden files when rounding up resource." 2011-09-08 14:16:23 -07:00
Doug Zongker c29dfcad75 Merge "save uid/gid/mode information of boot and recovery files" 2011-09-08 12:04:27 -07:00
Brian Muramatsu 8658fa51d1 am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5 
* commit '9d014e6570deb3861b503833823e56e1c589626c':
  Disable Dexpreopt for generic_arm5
 2011-09-08 10:26:29 -07:00
Brian Muramatsu 9d014e6570 am 9353a3be: Disable Dexpreopt for generic_arm5 
* commit '9353a3be5fca8a83c3a60e890fbca323f9fb0e04':
  Disable Dexpreopt for generic_arm5
 2011-09-08 10:24:14 -07:00
Raphael 9b73fdabc4 Merge "Enable 'make traceview' under Windows." 2011-09-08 10:16:44 -07:00
Brian Muramatsu d47da70817 am 3eae5b7c: am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS Build 
* commit '3eae5b7c1b3197bed4c883a671cfea9d5d9570bf':
  Use package.apk.unaligned in CTS Build
 2011-09-08 10:08:27 -07:00
Brian Muramatsu 9353a3be5f Disable Dexpreopt for generic_arm5 
Bug 5267392

After coming across another place where I would have to use
package.apk.unaligned, I decided maybe it is best to just
disable dexpreopt as was previously suggested.

Use package.apks in the CTS Makefile task.

Change-Id: Iec839a72f4b53441337523b8a9cccda657eec8e8
 2011-09-07 18:12:22 -07:00
Ying Wang d9020c2e9a Add ABI specific include path for NDK. 
Change-Id: I37a935126b9a1e544fc5a7471cf6ca224fc89cf3
 2011-09-07 14:31:47 -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
Ying Wang 41346ae407 am ba35b2d6: resolved conflicts for merge of 162991be to gingerbread-plus-aosp 
* commit 'ba35b2d61531a071533891307904e6ad7f81fb65':
  Allow uninstallable APPs.
 2011-09-07 11:25:42 -07:00
Ying Wang ba35b2d615 resolved conflicts for merge of 162991be to gingerbread-plus-aosp 
Change-Id: I06edde6c517b4c4e2bd03e2d1d44da52ee3066d5
 2011-09-07 11:20:28 -07:00
Ying Wang 162991beb5 Allow uninstallable APPs. 
Bug: 5264671
This is needed by cts tests.
It's harmless to existing modules.

Change-Id: I0083471f80d483559b27523d4b88190d7913f6f1
 2011-09-07 10:32:39 -07:00
Raphael 1518506345 Enable 'make traceview' under Windows. 
Change-Id: I2b89d2ee66d0bb4a1b2bb6e4ea15d3b0419cead9
 2011-09-06 16:39:37 -07:00
Justin Ho 0f2e55e47d Merge "Updated dex-preopt BOOTCLASSPATH with values from init.rc Bug: 5032006" 2011-09-06 13:18:22 -07:00
Justin Ho 0279b62d16 Updated dex-preopt BOOTCLASSPATH with values from init.rc 
Bug: 5032006

Change-Id: I6ed7e55ec2b278c0d60ad4e17208480d05af61bc
 2011-09-06 13:04:36 -07:00
Doug Zongker e1a8e3aef3 allow setting LOCAL_STRIP_MODULE on multi_prebuilts 
Change-Id: I4a58255381ba8a50d8f9512bf9892f5050599393
 2011-09-06 10:31:37 -07:00
Brian Muramatsu 3eae5b7c1b am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS Build 
* commit '08b8e0024812ea907cf3938bcd07b8dca6188eaf':
  Use package.apk.unaligned in CTS Build
 2011-09-02 16:56:07 -07:00
Brian Muramatsu 08b8e00248 am 2306106d: Use package.apk.unaligned in CTS Build 
* commit '2306106d3e2cd774ef0b2cd782442f90c402341f':
  Use package.apk.unaligned in CTS Build
 2011-09-02 16:53:43 -07:00
Brian Muramatsu 2306106d3e Use package.apk.unaligned in CTS Build 
Bug 5252989

This prevents dexopt installation failures when trying to
install CTS apks on production devices.

Change-Id: I1eeb0ac567c3be3b831c8c27dee4005ec00fd7cd
 2011-09-02 15:29:10 -07:00
Justin Ho 19b22a9413 Remove pinyinIME 
Change-Id: If83419336294eb56d5b96384a7bc9d9821888b02
 2011-09-02 08:00:53 -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 041fb639bf sdk: Fix broken google_sdk and google_sdk_x86 add-on build. 
This patch fixes the broken builds for PRODUCT-google_sdk-sdk_addon
and PRODUCT-google_sdk_x86-sdk_addon.

Change-Id: Iba0f23a03c143cd38aaba98b0bd0d52686330ed6
 2011-08-31 00:43:07 +02:00
Justin Ho 17a27047bb Revert Ic7c40c50: Support to run dex-preopt on prebuilt apks 
Collect some additional system image space, moving odex files to user partition on trygon-user

Change-Id: If992536ff0da14cc5b9ba51811b8a0b76f1b8f83
 2011-08-30 14:29:18 -07:00
Stephen Hines a941d137fa Provide LOCAL_RENDERSCRIPT_TARGET_API override. 
BUG=5206223

This allows us to set the RS API level independent of the other SDK
versions that a developer might choose.

Change-Id: Id8b476abcbbbdaa86e04ba0ea16414cb2fa5bd15
 2011-08-29 19:00:25 -07:00
Eino-Ville Talvala 5d8a5ceecb Merge "Add filterfw.jar to standard list of java libraries to include." 2011-08-29 15:12:04 -07:00
Ying Wang 45bee774eb am a1b603a5: am 4b398749: am c5033a33: Merge "x86: remove obsolete comments" 
* commit 'a1b603a556e338d4899a62ea37810aff81ab7fa1':
  x86: remove obsolete comments
 2011-08-29 11:05:08 -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
Eino-Ville Talvala 76a7d82fac Add filterfw.jar to standard list of java libraries to include. 
Since classes from this jar are part of the public API, it should be
included by default.

Also add the jar into the dex_preopt list.

Bug: 5098987
Change-Id: Ib39deffea43714eb56630ad1d65411cfde5878fd
 2011-08-26 14:22:57 -07:00
Ying Wang a1b603a556 am 4b398749: am c5033a33: Merge "x86: remove obsolete comments" 
* commit '4b3987498eb15dc654fe572aadf53396aac36479':
  x86: remove obsolete comments
 2011-08-26 12:12:48 -07:00
Ying Wang 4b3987498e am c5033a33: Merge "x86: remove obsolete comments" 
* commit 'c5033a3357b824a8285da67357a0d289750f4a72':
  x86: remove obsolete comments
 2011-08-26 12:10:45 -07:00
Ying Wang c5033a3357 Merge "x86: remove obsolete comments" 2011-08-26 10:41:16 -07:00
David 'Digit' Turner 9d99d7dfb8 resolved conflicts for merge of 6da54b6e to master 
Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
 2011-08-26 00:53:34 +02: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 6da54b6e0e resolved conflicts for merge of 7be88d00 to honeycomb-plus-aosp 
Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
 2011-08-25 23:23:32 +02:00
David 'Digit' Turner 80d41e4b75 am a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable" 
* commit 'a2cc9b227ae01803dfc4bc1987071fd6eee08bb6':
  sdk: add DLL_EXTENSION as an atree variable
 2011-08-25 12:14:35 -07:00
David 'Digit' Turner 7be88d00bb am 77c6261f: Merge "emulator: Enable GLES emulation libraries" 
* commit '77c6261fb074d87b75d669dd9fb9ab5a12a52cc9':
  emulator: Enable GLES emulation libraries
 2011-08-25 12:14:33 -07:00
Jean-Baptiste Queru d7d096df71 Tighten the toolchain version check 
Bug: 3076137
Change-Id: Ibd9f1f13916e31596f94a5b0a90293995da7f2cf
 2011-08-25 11:29:54 -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
Ying Wang 6e41a7483a Merge "Provide mechanism to override llvm-rs-cc headers." 2011-08-24 10:26:41 -07:00
Stephen Hines d4136c0fc6 Provide mechanism to override llvm-rs-cc headers. 
Change-Id: I87fd496069a9dfde633e2d232e436fa5d7315cc0
 2011-08-23 22:01:49 -07:00
jeffhao ca94f3583f Removing target-api option from build. 
This is cherry-picked from dalvik-dev.

Change-Id: I85cd23c08fcad400e6426cdaad079e91dcd9babf
 2011-08-23 14:18:24 -07:00
David 'Digit' Turner 43dd89d2a0 emulator: Enable GLES emulation libraries 
This patch enables the build of OpenGLES emulation libraries
(both in the guest and the host) for any emulator-specific
product config.

+ update core/main.mk to ensure that the right path is parsed
  when building the Windows SDK

Change-Id: Ifde047f8c0ef922504a7286c8c5b57f7c79c71f8
 2011-08-23 22:25:13 +02:00
Raphael Moll 88833405c4 am cfdfad3f: am 807c7980: am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths." 
* commit 'cfdfad3fcadc8bba30f00dbe2f2e835d61cde9ef':
  Add sdk/rule_api to the Windows build paths.
 2011-08-17 11:36:25 -07:00
Raphael Moll cfdfad3fca am 807c7980: am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths." 
* commit '807c79802d5e8b1613bf36bb780cf3250f443aa2':
  Add sdk/rule_api to the Windows build paths.
 2011-08-17 11:29:48 -07:00
Raphael Moll 807c79802d am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths." 
* commit '7d9fe5174787a5638993a15b165bc9115c16da0f':
  Add sdk/rule_api to the Windows build paths.
 2011-08-17 11:26:07 -07:00
Wink Saville 15e199c857 DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2. 
Change-Id: Ib30bf10669119b588c691e4cebdc8093f402e3e4
 2011-08-17 10:03:51 -07:00
Raphael Moll 408c7f8a8f Add sdk/rule_api to the Windows build paths. 
Change-Id: I4976b50d829e4b26b4f9935a1a184937dd115198
 2011-08-16 19:40:03 -07:00
Brian Swetland d1975a2946 fix tiny android builds (add mksh) 
Change-Id: I0cf5068b6e9b350259009c5ecf7f2946d05f7b2d
 2011-08-16 16:15:26 -07:00
Stephen Hines c963eae72c Update build to properly use prebuilt llvm-rs-cc. 
Change-Id: I52a83066b6c08d05d69db4f93631eeaf9c0b41c6
 2011-08-10 17:01:43 -07:00
Ying Wang 6ab5d6aa16 Discard hidden files when rounding up resource. 
Aapt will discard the hidden files anyway.
With this change, we can avoid unnecessary rebuild if a module has only
hidden files in its resource dir.

Change-Id: Iaf0a13e038cca5fb60012c550cc90f7abbe967e1
 2011-08-10 16:05:51 -07:00
Chih-Wei Huang aa1c321a58 x86: remove obsolete comments 
Change-Id: Ifb12892c17a50f85c7700d6413ea295a4dad7047
 2011-08-03 12:16:59 +08:00
Dan Morrill 6d0f51b44b Updating version to 2.3.7 to reflect some patches. 
Change-Id: I6118b41a26a1ea6940758313871eb8ab83ab06a2
 2011-08-02 16:46:38 -07:00
Dan Morrill b3eae868dd Bumping version to 2.3.6 to reflect a few patches. 
Change-Id: I540a3954c70502e3deac151c642d454c87a3821b
 2011-08-02 15:36:05 -07:00
Raphael Moll b194b9d185 am dd9e8477: am 266a571f: am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths." 
* commit 'dd9e8477e6cc1a8de556dd7942fb81c049e2e373':
  Add sdk/assetstudio to the Windows build paths.
 2011-07-29 14:34:01 -07:00
Ying Wang 603755d6ce resolved conflicts for merge of 9b5447df to master 
Change-Id: I1fe490a9e0bf01321c845ab0150fead06c16d68b
 2011-07-29 14:25:59 -07:00
Raphael Moll dd9e8477e6 am 266a571f: am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths." 
* commit '266a571fbd557c402e937130922ced8c523dd451':
  Add sdk/assetstudio to the Windows build paths.
 2011-07-29 13:59:23 -07:00
Ying Wang 9b5447df85 am 24cad7d4: Add iptables and ip6tables to core.mk. 
* commit '24cad7d4f7962d3413d520791cb2b8a5a5266f58':
  Add iptables and ip6tables to core.mk.
 2011-07-29 13:58:43 -07:00
Raphael Moll 266a571fbd am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths." 
* commit 'dceb46559eb8077553d1bd4d738fb4b325af9396':
  Add sdk/assetstudio to the Windows build paths.
 2011-07-29 13:56:51 -07:00
Ying Wang 24cad7d4f7 Add iptables and ip6tables to core.mk. 
Change-Id: I1cb2be8a28013b20d1032a8d766021a2f4aca9e1
 2011-07-29 13:47:23 -07:00
Raphael Moll 667ec86a33 Add sdk/assetstudio to the Windows build paths. 
Change-Id: Ide8d418aa25cf39852a25e08fd2a27c7882586e7
 2011-07-29 13:04:53 -07:00
Ying Wang 6e7db38de7 Use shell variable to eliminate $(eval) in commands. 
$(eval) in the commands does not evaulate in the same order in emake as
in gmake. Using shell vars work in both makes.

Change-Id: I4e95adb2bc6f4600e29b9a8524275a099f47a401
 2011-07-27 12:57:37 -07:00
Ying Wang b934e49c3a Put the NDK library paths ahead of TARGET_GLOBAL_LD_DIRS 
To avoid race condition:
Say a module with LOCAL_NDK_VERSION built in the full source tree,
Before this change it may be linked against TARGET_GLOBAL_LD_DIRS/libc.so
that's being partially written out by the linker, because there is no dependency
between the module and TARGET_GLOBAL_LD_DIRS/libc.so.

Change-Id: If6e4921d226fee133b53e4d819a07b48f4fca016
 2011-07-20 15:42:53 -07:00
Doug Kwan be3689e981 Conditionally disable -Wno-unused-but-set-variable for gcc-4.6. 
We used to do that unconditionally but that caused lots of spurious
warnings in gcc-4.4.x about an unrecognized gcc option.

Change-Id: Idb5118b069871859e07a7efa04914ab6ed0b1372
 2011-07-14 16:34:26 -07:00
Tsu Chiang Chuang 64000a2a00 Merge "fix mixing argument in makefile." 2011-07-13 16:59:08 -07:00
Tsu Chiang Chuang 44802a22e3 fix mixing argument in makefile. 
Change-Id: I659d996dda0a2047ebb3240607e66411fc60fda6
 2011-07-13 16:40:33 -07:00
Ying Wang a7d9ca371e Use the LOCAL_* as dependency. 
PRIVATE_* should be used only in the build commands.

Change-Id: Ie1d8db7c78012a8615b893d3ef3be893da7466f4
 2011-07-13 14:29:33 -07: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 d19750e87f am 36331f84: resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp 
* commit '36331f8455822539fe4fbb0a25fbc377bbc80a89': (23 commits)
  sdk-addon.mk: Copy image files to ABI-specific dir
  emulator: Enable dex-preoptimization
  sdk: provide ABI-dependent atree files
  emulator: Build emulator platform images as ARMv7-A
  x86: Add proper gcc-4.4.3 x86 toolchain support.
  sdk: Add pc-bios files for IA qemu emulator
  x86: qemu emulator is the default build target
  Add full_x86 product.
  x86: sdk_x86 build target
  Minor cleanup - DO NOT MERGE
  Clean up full config - DO NOT MERGE
  Make a full list of locales available
  Truly default to the full config.
  generic_x86 builds don't need/use the sparse ext4 format.
  Use ext4 file system for generic_x86 userdata partition
  GB Updates for init.rc and boot command line
  Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
  Display the TARGET_ARCH_VARIANT
  Add generic_x86-eng to the lunch menu
  Move buildspec vars to BoardConfig.mk
  ...
 2011-07-11 11:55:35 -07:00
David 'Digit' Turner 36331f8455 resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp 
Change-Id: If2b21def45b5de222e560af442a0ff9f56da5a35
 2011-07-11 20:48:41 +02:00
Doug Kwan a6467cc874 Disable gcc-4.6's Wunused-but-set-variables warning. 
Change-Id: Ia02fa536410b9200beca1d9d120ec448c82e5ca8
 2011-07-08 18:50:10 -07:00
Jaikumar Ganesh eb0a62cb26 am b399f5e8: Merge "Rename health shared library." 
* commit 'b399f5e81e2a644776f163e499df5bd0a38fe272':
  Rename health shared library.
 2011-07-08 11:34:46 -07:00
Jaikumar Ganesh 19efd6f11f Rename health shared library. 
Change-Id: Ibd95333433bc2fb12322a9683bb3e0c0176dbce9
 2011-07-08 11:20:49 -07:00
David 'Digit' Turner 9fb131a9b6 sdk-addon.mk: Copy image files to ABI-specific dir 
Change-Id: I39ad022a5bb03ea39fc41c134d1d4855dc491deb
 2011-07-08 01:56:51 +02:00
David 'Digit' Turner 3248bb2e07 sdk: provide ABI-dependent atree files 
Backport from AOSP master

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: Ib76caa54a059eca2dafc9cdba812b29f98b5e3c3
Orig-Change-Id: Icdca751852c01421fccf196436a9bc1114ea90f7
 2011-07-07 23:57:22 +02:00
Ying Wang 4227d02e6f Merge "Enable LOCAL_STRIP_MODULE for prebuilt binaries" 2011-07-07 09:29:19 -07:00
Ji-Hwan Lee 0219e9292e Enable LOCAL_STRIP_MODULE for prebuilt binaries 
Currently, prebuilt binaries with debug symbols are installed unstripped.

There are only a few of prebuilt shared library (that I'm trying to fix),
so I can do this manually by making intermediate target and applying
TARGET_STRIP, each of them, one by one.

But dynamic_binary.mk has more features than stripping binaries
(like copying unstripped binaries to symbols directory)
and if I do it manually, they will lose all the benefits.

Note that this doesn't change anything when LOCAL_STRIP_MODULE is not set.
I actually tried to force strip every BUILD_PREBUILT'ed modules,
but there were a few problems:

- Some packages are not installed (i.e. not in PRODUCT_PACAKGES)
  but are built (i.e. in ALL_MODULES).  And some of them are built in spite
  that they do not have appropriate prebuilt shared library for TARGET_ARCH.
  Stripping them causes "unknown format".

- Some prebuilt modules set LOCAL_MODULE_CLASS incorrectly.
  Example is default.supp of external/valgrind/main, which should be ETC,
  not SHARED_LIBRARY.

Both are better fixed, but I concluded that it's better to be conservative.

Bug: 4585734
Change-Id: If71723b1d76007d45b02429ea5161a8265dd5b6d
 2011-07-07 11:07:18 +09:00
Bruce Beare 63152fd929 x86: Add proper gcc-4.4.3 x86 toolchain support. 
This patch combines 7 AOSP patches to add proper support
to build x86 platform images using the 4.4.3 toolchain.

The Orig-Changed-Id fields below correspond to the change ids
of the original changes in the AOSP master branch history.

    Define __ANDROID__ for x86 to be on par with ARM build requirements
    Orig-Change-Id: I79c8f29af1f20b694f22a39f848216022809a5c6
    Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>

    Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
    Orig-Change-Id: Idbceb6c7d4117fbecd35e4261330e6405666189e

    IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings
    Change-Id: I9ba661d68a3b375c21eb6b56442d8ba66a5369b3
    Orig-Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586
    Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>

    x86: Use GCC 4.4.3
    Orig-Change-Id: I083c1afcbb98cfeb48d7bcb7681e5c34db52e767
    Author:    H.J. Lu <hjl.tools@gmail.com>
    Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>

    x86: the -mbionic flag is needed for IA builds.
    Orig-Change-Id: I00c75f37d7ea46b9f8ad3d7b2ff7094477ff0916
    Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>

    x86: Disable stack-protector until bionic is fixed
    Orig-Change-Id: I2862de5c1b02490197704f4578a8a91d0565eef0
    Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>

    Clean up of X86 build flags
    Orig-Change-Id: Ife75c32cd49b32345712dee28fa5f2283069a90e
    Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
    Author: Bruce Beare <bruce.j.beare@intel.com>

    x86: Enable -fstack-protector
    Orig-Change-Id: I1fe10159b7a29452ecfc6ba328164948cf9950d6
    Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2011-07-07 03:45:57 +02:00
Bruce Beare f844ec96dd x86: qemu emulator is the default build target 
Change-Id: I200536d2d997eda6a6e62eaa9050269e3c7ff6c4
Orig-Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
 2011-07-07 03:45:57 +02:00
Jean-Baptiste Queru 8a545e04ee Truly default to the full config. 
It is much better than generic for emulator-based work.

Orig-Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
 2011-07-07 03:45:57 +02:00
Bruce Beare ecabf85f32 Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures 
Orig-Change-Id: I5c1010d9caaa8d9ffaf65999fa3649c3c2be8caa
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2011-07-07 03:45:56 +02:00
Bruce Beare f7e4141f0e Display the TARGET_ARCH_VARIANT 
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2011-07-07 03:45:56 +02:00
Bruce Beare f7661706b0 Allow TARGET_ARCH to be set from BoardConfig.mk 
Orig-Change-Id: I66aed78b763d238719822257c1f4f35301247df6
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2011-07-07 03:45:56 +02:00
Bruce Beare c101e27d54 Refactor Stripper. Allow a stripper other than SOSLIM to be specified 
Orig-Change-Id: I61137f5bb123dc5f610af9928ed3debdf85ba74d
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2011-07-07 03:45:56 +02:00
Ying Wang c0a177c8ec Remove vpn from FRAMEWORKS_BASE_SUBDIRS 
To eliminate build warning.
Reference commit: 44e27b5c74b5f441973561a4f945cb58e0cc45a4
which removed framework/base/vpn.

Change-Id: I539e4bc2a4008c8b9eed74dd53eec1f55db3abe5
 2011-07-05 15:37:22 -07:00
Mike Lockwood 40b5a67ecd Remove obsolete persist.service.adb.enable property from default.prop 
Change-Id: I59a2da01eddfc1fa775e027a86f7f818a146a6b0
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-01 12:31:47 -04:00
Evgeniy Stepanov 8f77c9ded3 Add .gnu_debuglink when stripping DSOs. 
This is used by debug tools to find symbols for the stripped binary.
Adds ~70 bytes to each DSO, ~25000 bytes total, which is about 0.01% of the
system image.

This change only affects -eng and -userdebug builds, and does not affect -user.

Change-Id: I0c92a9e09fbc97184dea66813923568cbcc2a3fe
 2011-06-28 12:47:34 +04: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 0ef25320d5 am a85ebfb0: am fa112f98: am c134712f: am 04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules" 
* commit 'a85ebfb059080865a549539a9d2758c4e8b8aeed':
  Turn-off implicit GNU Make RC/SCCS rules
 2011-06-23 14:29:59 -07:00
Raphael ecb957705c resolved conflicts for merge of 732936d9 to master 
Change-Id: I1fc667057aebbbef19bde746ebcc650ac0e8c35c
 2011-06-23 13:52:29 -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 6236d356a0 am b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent atree files" 
* commit 'b92c7a2c1293d2921739a4d7210b4a0d1c99156b':
  sdk: provide ABI-dependent atree files
 2011-06-23 13:08:35 -07:00
David 'Digit' Turner cac8e55714 Merge "sdk: provide ABI-dependent atree files" 2011-06-23 12:18:49 -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 4aed64341c am 0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries. 
* commit '0b6ece9dafcf6f06dd4418829434cdc4376375a3':
  SDK: properly strip all SDK llvm-rs-cc linux binaries.
 2011-06-22 19:05:16 -07:00
David 'Digit' Turner a85ebfb059 am fa112f98: am c134712f: am 04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules" 
* commit 'fa112f982241fc3efa0129094e87a34f2317f41e':
  Turn-off implicit GNU Make RC/SCCS rules
 2011-06-22 18:05:06 -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 9de99fe2d2 Use the host STL for host native test. 
Bug: 4584343
Change-Id: I420b7d955142d57993295cec12e54c94d5a75b88
 2011-06-22 16:01:48 -07:00
David 'Digit' Turner fa112f9822 am c134712f: am 04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules" 
* commit 'c134712ffa9e6617df46334a6293ddd80e05cf98':
  Turn-off implicit GNU Make RC/SCCS rules
 2011-06-22 15:53:31 -07:00
David 'Digit' Turner 04b4910971 Merge "Turn-off implicit GNU Make RC/SCCS rules" 2011-06-22 14:40:52 -07:00
Raphael 732936d99a resolved conflicts for merge of 8508a073 to honeycomb-plus-aosp 
Change-Id: I376928881adb0e9fd62fabc1e21542bf0d700ca2
 2011-06-22 14:35:32 -07:00
David 'Digit' Turner 52d697d432 Turn-off implicit GNU Make RC/SCCS rules 
This small patch prevents GNU Make from stating RCS and SCCS
specific files on the filesystem. This makes the output of
"make -d" slightly more readable, and also reduces the no-change
time on AOSP master by a bit less than a second on average.

Change-Id: Ifa50ace32e8689717956d7247b0d6f53ef72b7a1
 2011-06-22 23:18:57 +02:00
Raphael Moll 8508a07352 am 6e65ddb2: am cb84196f: Merge "Lunch: don\'t use a toolchain that doesn\'t exist." 
* commit '6e65ddb20aa82522b3fdc72c87d365f22e9a43ed':
  Lunch: don't use a toolchain that doesn't exist.
 2011-06-22 10:40:08 -07:00
Raphael Moll c639c787a0 Lunch: don't use a toolchain that doesn't exist. 
"lunch sdk-eng" on cygwin tries to use a gcc.exe from the
prebuild arm toolchain, but it doesn't exist. This prevents
from setting variables to point on a gcc toolchain if there
is none for the given arch.

Change-Id: I3b72220663687f9fdaacc050899aef00632f2c3c
 2011-06-21 06:11:05 -07:00
Ying Wang c383f1b65d Merge "Uniq the system properties." 2011-06-20 11:05:27 -07:00
Ying Wang cf5da40e52 Fix tab. 
The tab broke unbundled targets.

Change-Id: Ia97d4bdd69f7bb48eb3c51a01f0ab7085b5949a0
 2011-06-17 17:44:08 -07:00
Ryo Fujii c0de1ea8df Merge "fix broken build rules for host VM." 2011-06-17 17:25:04 -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
Eric Laurent 99acb9c261 created speex resampler library 
Change-Id: I4424cb40416d94ccf4637fbbb53f02d595c31e3d
 2011-06-17 14:21:17 -07:00
Jean-Baptiste Queru cc7dccc815 am 91ba5de8: am 1894085d: Merge "Tweak prelink map even more" 
* commit '91ba5de815d7bec3b7e72ddf2c5b063f42b7211b':
  Tweak prelink map even more
 2011-06-17 14:12:30 -07:00
Jean-Baptiste Queru 7751f426fe Tweak prelink map even more 
Change-Id: I83149194f8c4e0193274f9c74d9718cecba82cb0
 2011-06-17 13:20:32 -07:00
Jean-Baptiste Queru af1b618c0d am c5e5d989: am 9d7590b9: Merge "Tweak prelink map" 
* commit 'c5e5d9897f6fc18123a8f5d15a90152019979a22':
  Tweak prelink map
 2011-06-17 12:21:37 -07:00
Jean-Baptiste Queru c5e5d9897f am 9d7590b9: Merge "Tweak prelink map" 
* commit '9d7590b93ff549cf8a4b432932fa68799166ed79':
  Tweak prelink map
 2011-06-17 11:59:32 -07:00
Ryo Fujii cbb3266b47 fix broken build rules for host VM. 2011-06-17 11:58:58 -07:00
Jean-Baptiste Queru 36c1f10dee Merge "Relax the constraint of 64bit build environment." 2011-06-17 11:19:14 -07:00
Ying Wang 2914f7f3b3 Relax the constraint of 64bit build environment. 
Change-Id: Id349f424b122816f42c99769b629a9447986cf20
 2011-06-17 11:18:10 -07:00
Jean-Baptiste Queru 82b96df215 Tweak prelink map 
Change-Id: Ic04a67eab8a94a1cbb045dd460e15c2b673392b2
 2011-06-17 11:15:00 -07:00
Jean-Baptiste Queru 5e2e09c569 am ee803184: am f771489d: Merge "Tweak prelink map, more" 
* commit 'ee8031843e4dc3e9ff60c1acdc516121145fece1':
  Tweak prelink map, more
 2011-06-17 08:04:31 -07:00
Jean-Baptiste Queru ee8031843e am f771489d: Merge "Tweak prelink map, more" 
* commit 'f771489d95289bf0d98cb92b504fccbe0a1f5fd7':
  Tweak prelink map, more
 2011-06-17 07:57:22 -07:00
Jean-Baptiste Queru 398aaee7d7 Tweak prelink map, more 
Change-Id: Ia78df90647029cfec76c7ccb7e71c477a4b6f9e7
 2011-06-17 07:33:52 -07:00
Jean-Baptiste Queru 2ba042f9d8 am 40dc95be: am 14273125: Merge "Tweak prelink map" 
* commit '40dc95be7744871b5363ae2e21a14343cd666b0f':
  Tweak prelink map
 2011-06-16 17:32:11 -07:00
Jean-Baptiste Queru 40dc95be77 am 14273125: Merge "Tweak prelink map" 
* commit '142731256afc708f4ec07247bffbe733dcaed0f4':
  Tweak prelink map
 2011-06-16 17:09:14 -07:00
Jean-Baptiste Queru 1c594eab70 Tweak prelink map 
Change-Id: Id4a3aea8ecc1c04178303c543fa81cecf4cf85f1
 2011-06-16 16:17:52 -07:00
Jean-Baptiste Queru 13c7c0234d am eb9fc27d: am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default" 
* commit 'eb9fc27dbe062248167981d2a4f1aa9e058a2313':
  Switch back to mksh as the default
 2011-06-16 13:09:12 -07:00
Jean-Baptiste Queru eb9fc27dbe am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default" 
* commit '4c90a648cd0e1310d4b934c54905af3cf40b2770':
  Switch back to mksh as the default
 2011-06-16 12:57:33 -07:00
Jean-Baptiste Queru 4c90a648cd am 14bf45f3: Merge "Switch back to mksh as the default" 
* commit '14bf45f31d99cdaa5cc0c46efa3f2c2724704173':
  Switch back to mksh as the default
 2011-06-16 11:39:18 -07:00
Jean-Baptiste Queru 256b14b2f8 Switch back to mksh as the default 
Change-Id: I4f39e8d8cc22520cd36f83f8675a716cc1ade1d9
 2011-06-16 09:34:06 -07:00
Dianne Hackborn 8edd7f9a35 resolved conflicts for merge of 3f72af13 to master 
Change-Id: I675df80f6e4435e6fb275c8c1527fdc966c0322c
 2011-06-10 14:00:55 -07:00
Dianne Hackborn 3f72af1370 Merge cb5b6d16 
Change-Id: I95670014aa3e8b83713169e4f414ef058b15f870
 2011-06-10 07:29:48 -07:00
Dianne Hackborn cb5b6d1690 am 0b22d93b: Welcome, Android 3.2. 
* commit '0b22d93be32eeff06e6626ad766b040057b931a5':
  Welcome, Android 3.2.
 2011-06-09 17:25:43 -07:00
Dianne Hackborn 0b22d93be3 Welcome, Android 3.2. 
Change-Id: Iedf0f75a3338aca09647779f3cbfb4a94f615493
 2011-06-09 16:40:02 -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
Dan Morrill bb41d06d96 Update version to 2.3.5. 
Change-Id: I310c09c6f2d1c0e0067bf4a44bed5958664c1591
 2011-06-09 13:20:55 -07:00
Joe Onorato 569e4fab49 Merge "post process the system properties" 2011-06-08 16:04:45 -07:00
Joe Onorato 9197a487b4 post process the system properties 
Change-Id: Ib78fe238d90dd4523326e4fa088d9333edc9e299
 2011-06-08 16:04:14 -07:00
Jean-Baptiste Queru 1cc1b10f0b am f0d2a546: Merge 78e7f1f0 
* commit 'f0d2a54669c8bf14e95482437e361c81dfb62404':
  Increase the Java heap size for droiddoc
 2011-06-07 18:20:30 -07:00
Jean-Baptiste Queru 70776231ee am 45a3ad7d: Merge c1efb060 
* commit '45a3ad7d225495367a47440da118609b4940fe71':
  Relax the constraint of 64bit build environment.
 2011-06-07 18:20:25 -07:00
Jean-Baptiste Queru f0d2a54669 Merge 78e7f1f0 
Change-Id: I4d24d154fd3964a4433baf87e4061421fce28986
 2011-06-07 13:11:14 -07:00
Jean-Baptiste Queru 45a3ad7d22 Merge c1efb060 
Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
 2011-06-07 13:10:06 -07:00
Doug Kwan e3c3c6d4fe Allow per module RTTI setting. This fixes a bug in previous check-ins. 
Change-Id: I5fcac192a7945720fd7667f7497078d310370bc5
 2011-06-07 10:55:48 -07:00
Martijn Coenen 3c22287c1b Revert "x86: Enable -fstack-protector" 
This reverts commit e397dcccbb.
 2011-06-07 08:57:34 -07:00
Ying Wang 65b710aefd Merge "Use arg list file to pass arguments to jar." 2011-06-06 16:24:46 -07:00
David Turner 5d627263c8 am 0a2d335e: am c1705c9a: Merge "x86: Enable -fstack-protector" 
* commit '0a2d335e99bae3c257c0e26fe180d00de04bebaa':
  x86: Enable -fstack-protector
 2011-06-06 14:39:32 -07:00
Ying Wang 194a8ec8ae Use arg list file to pass arguments to jar. 
To fix error "/bin/bash: Argument list too long"

Change-Id: Ie336b18f9a7eba38d94a6e32c07a88589ce9f1fd
 2011-06-06 14:34:52 -07:00
Doug Kwan 1081a05359 Merge "Revert "Clear LOCAL_RTTI_FLAG."" 2011-06-06 13:20:49 -07:00
David Turner 486ce3495c am e4778e6a: am 4272b32a: Merge "Clean up of X86 build flags" 
* commit 'e4778e6ab82a40475081482f26759985deeb7f21':
  Clean up of X86 build flags
 2011-06-06 12:56:15 -07:00
David Turner 0a2d335e99 am c1705c9a: Merge "x86: Enable -fstack-protector" 
* commit 'c1705c9ad8da4d6c2d267e27afd6e16aa7b431b6':
  x86: Enable -fstack-protector
 2011-06-06 12:27:26 -07:00
Doug Kwan 6f937973ff Revert "Clear LOCAL_RTTI_FLAG." 
This reverts commit f524df7ce1.
 2011-06-06 12:11:19 -07:00
David Turner e4778e6ab8 am 4272b32a: Merge "Clean up of X86 build flags" 
* commit '4272b32a86bd22ce560e41816cece950a7af4e51':
  Clean up of X86 build flags
 2011-06-06 11:33:04 -07:00
Jean-Baptiste Queru 78e7f1f014 am 536938e0: am 978f86ea: Merge "Increase the Java heap size for droiddoc" 
* commit '536938e01195a2ee279a6652e0b88c50d5f4c2a8':
  Increase the Java heap size for droiddoc
 2011-06-06 08:23:09 -07:00
Jean-Baptiste Queru 536938e011 am 978f86ea: Merge "Increase the Java heap size for droiddoc" 
* commit '978f86ea5439ce192e9c343fc2565f1ec4e2e6d2':
  Increase the Java heap size for droiddoc
 2011-06-06 08:19:48 -07:00
Jean-Baptiste Queru 978f86ea54 Merge "Increase the Java heap size for droiddoc" 2011-06-06 08:12:31 -07:00
Doug Kwan f524df7ce1 Clear LOCAL_RTTI_FLAG. 
Change-Id: I0f1388e76af1ce0592cd3271a689fbb6c0ea3eba
 2011-06-03 18:26:48 -07:00