summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Use shell variable to eliminate $(eval) in commands.Ying Wang2011-07-271-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | $(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
* | | | Merge branch 'master' of ssh://android-git:29418/platform/buildAndroid Git Automerger2011-10-113-5/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge "Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds"Ying Wang2011-10-111-0/+5
| |\ \ \
| | * | | Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk buildsYing Wang2011-10-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use.Ying Wang2011-10-102-5/+0
| |/ / / | | | | | | | | | | | | | | | | Bug: 5433204 Change-Id: Id88c21f8d1991d8cbcc5bb7dae784aa72dc4becf
* | | | mr0 - do not mergeEd Heyl2011-10-111-1/+1
|/ / / | | | | | | | | | Change-Id: I3b19b8cdad6820bc8ab2047ac48cb2964132a3fa
* | | am 49c6a2b5: fix build fingerprint: dev-keys vs test-keysDoug Zongker2011-10-051-2/+9
|\ \ \ | | | | | | | | | | | | | | | | * commit '49c6a2b5e4314bd8acfbca88cd43ea49a2c8c30e': fix build fingerprint: dev-keys vs test-keys
| * | | fix build fingerprint: dev-keys vs test-keysDoug Zongker2011-10-051-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am f9ede7e9: Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryromDoug Zongker2011-10-051-34/+48
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f9ede7e925a668cc8c0b44cb69c0795cb6c8c896': sign non-PRESIGNED prebuilt apks
| * | | Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryromDoug Zongker2011-10-051-34/+48
| |\ \ \
| | * | | sign non-PRESIGNED prebuilt apksDoug Zongker2011-10-051-34/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since dev keys can now vary per device, we can't assume they are checked in with the correct signature. Change-Id: I7577a3a6bd98d005c15936c99b2944acc4412798
| * | | | Merge "Install path support for vendor modules." into ics-factoryromYing Wang2011-10-053-5/+18
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Install path support for vendor modules.Ying Wang2011-09-213-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5284764 Set "LOCAL_PROPRIETARY_MODULE := true" to install module to vendor partition. Change-Id: I9acdda6b2ff3142628b9849ea534b3ec288545a0
* | | | | am 81703a19: Merge "Support for product-specific dev keys." into ics-factoryromEd Heyl2011-10-046-28/+50
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '81703a19001ec219c35cb0ecf9bafb6e0dbc1e1d': Support for product-specific dev keys.
| * | | | Support for product-specific dev keys.Ying Wang2011-10-046-28/+50
| | | | | | | | | | | | | | | | | | | | Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
| * | | | Cherrypick 6de7bc61 from master. do not merge.Xavier Ducrohet2011-09-211-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Copy notice file in the new system image folder Change-Id: I66496f382b2d13b030de569b573630f3abe5b9de
* | | | Enforce no prebuilt apks in PRODUCT_COPY_FILES.Ying Wang2011-09-291-0/+6
| | | | | | | | | | | | | | | | | | | | Bug: 5391935 Change-Id: I106ffc3277914e57cc1a6fb4cd782286d61b8013
* | | | Merge "Generate an empty target if there is no packages"Ying Wang2011-09-271-0/+2
|\ \ \ \
| * | | | Generate an empty target if there is no packagesYing Wang2011-09-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | resolved conflicts for merge of 2f2882a0 to masterDavid 'Digit' Turner2011-09-231-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Change-Id: Ia07eb9d022a8036c2b1674c591514740aa0d4596
| * | | | am fdb13fcc: am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and ↵David 'Digit' Turner2011-09-221-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | google_sdk_x86 add-on build." into gingerbread * commit 'fdb13fccfecdf526549ad453a20e8136253edb51': sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
| | * \ \ \ am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on ↵David 'Digit' Turner2011-09-221-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build." into gingerbread * commit '0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2': sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
| | | * \ \ \ Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into ↵David 'Digit' Turner2011-09-221-1/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | | * | | | sdk: Fix broken google_sdk and google_sdk_x86 add-on build.David 'Digit' Turner2011-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the broken builds for PRODUCT-google_sdk-sdk_addon and PRODUCT-google_sdk_x86-sdk_addon. Change-Id: Iba0f23a03c143cd38aaba98b0bd0d52686330ed6
* | | | | | | | Merge "Let's call MR0 4.0.1."Dianne Hackborn2011-09-211-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Let's call MR0 4.0.1.Dianne Hackborn2011-09-211-1/+1
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie55012702e2cfb1eb247941e8b73519ad9b5c547
* | | | | | | | Copy notice file in the new system image folderXavier Ducrohet2011-09-211-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I4fafe5dc9dc1749de56267206a9b847a97e6a14b
* | | | | | | am 04c48584: Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared ↵Ying Wang2011-09-201-0/+11
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libraries." into ics-factoryrom * commit '04c485843f9fce0f66d18cb96e1051b7382b1f38': Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.
| * | | | | | Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ↵Ying Wang2011-09-201-0/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ics-factoryrom
| | * | | | | | Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.Ying Wang2011-09-151-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that prebuilt shared libraries can be referenced with the module name in other module's Android.mk. Change-Id: I4c4b471696642694b805b71dd7605b91724ad924
| * | | | | | | Enable building sdk/avdlauncher in the Win SDK. DO NOT MERGE.Raphael2011-09-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required by Change-Id Ic651e3c3 in sdk.git Cherry-pick from master c36df7b12bb5e1e97e39c3576d330af37536b02d Change-Id: Ic51ad7df01ce1bc926ba69f8a031a060edbf0bd1
| * | | | | | | Don't strip llvm-rs-rc in core/Makefile. DO NOT MERGE.Raphael2011-09-161-9/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done in development/build/sdk.atree now. Cherry-pick from master 469bbdf8c37a74e236d129faeaa5483838af9028
* | | | | | | Merge "Install path support for vendor modules."Ying Wang2011-09-203-5/+18
|\ \ \ \ \ \ \
| * | | | | | | Install path support for vendor modules.Ying Wang2011-09-133-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5284764 Set "LOCAL_PROPRIETARY_MODULE := true" to install module to vendor partition. Change-Id: I1301acc10664a12e313f3b868d9fd6400ac8b133
* | | | | | | | am 7094bf3a: am 25863d73: build the sqlite3 binary for use by the OTA toolsDoug Zongker2011-09-201-0/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '7094bf3a5e9d1983d6877f580506d93fd736c437': build the sqlite3 binary for use by the OTA tools
| * | | | | | | am 25863d73: build the sqlite3 binary for use by the OTA toolsDoug Zongker2011-09-201-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '25863d738ca171015a57a2154ff6ebe4ae8f5483': build the sqlite3 binary for use by the OTA tools
| | * | | | | | | build the sqlite3 binary for use by the OTA toolsDoug Zongker2011-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2c6cc02dec74fdcedd3e2a6f3ddb1dfba657a883
| | * | | | | | | DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2.Wink Saville2011-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib30bf10669119b588c691e4cebdc8093f402e3e4
* | | | | | | | | New LOCAL_SDK_RES_VERSION config var.Dianne Hackborn2011-09-192-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge "Don't strip llvm-rs-rc in core/Makefile"Raphael2011-09-161-9/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't strip llvm-rs-rc in core/MakefileRaphael2011-09-151-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done in development/build/sdk.atree now. Change-Id: I2cd8e42192439851e1e42070cf74e6ee7c02ba59
* | | | | | | | | | Merge "Enable building sdk/avdlauncher in the Win SDK."Raphael2011-09-161-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Enable building sdk/avdlauncher in the Win SDK.Raphael2011-09-161-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required by Change-Id Ic651e3c3 in sdk.git Change-Id: I97f389d052ba9abf1c40547abbc6d7c164bdf405
* | | | | | | | | Use LOCAL_REQUIRED_MODULES to add dependency of installed shared librariesYing Wang2011-09-151-56/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge commit '4d7ddab160ba29247225e11c2092dcfd68bd6baf' into ics-factoryromEd Heyl2011-09-151-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Hello, Android 4.0.Dianne Hackborn2011-09-141-3/+3
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I0d775bc81e1fb1c3ca0151b15a582035109dc5b5
* | | | | | | | default versionEd Heyl2011-09-151-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I6ca2be74916b5bebffd910fdbcbefe158fdfc562
* | | | | | | Move forward installed-files.txt in the dependency graphYing Wang2011-09-091-33/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am 8658fa51: am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5Brian Muramatsu2011-09-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8658fa51d15290cf43178d0633b53f11ff08a4aa': Disable Dexpreopt for generic_arm5
| * | | | | | am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5Brian Muramatsu2011-09-081-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '9d014e6570deb3861b503833823e56e1c589626c': Disable Dexpreopt for generic_arm5
generated by cgit v1.1 at 2024-12-25 15:44:32 +0000