summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | am 9353a3be: Disable Dexpreopt for generic_arm5Brian Muramatsu2011-09-081-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '9353a3be5fca8a83c3a60e890fbca323f9fb0e04': Disable Dexpreopt for generic_arm5
| | | * | | | Disable Dexpreopt for generic_arm5Brian Muramatsu2011-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am 41346ae4: am ba35b2d6: resolved conflicts for merge of 162991be to ↵Ying Wang2011-09-081-7/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread-plus-aosp * commit '41346ae4077c7dee66a7c04dc91714569dca9303': Allow uninstallable APPs.
| * | | | | | am ba35b2d6: resolved conflicts for merge of 162991be to gingerbread-plus-aospYing Wang2011-09-071-7/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ba35b2d61531a071533891307904e6ad7f81fb65': Allow uninstallable APPs.
| | * | | | | resolved conflicts for merge of 162991be to gingerbread-plus-aospYing Wang2011-09-071-7/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | Change-Id: I06edde6c517b4c4e2bd03e2d1d44da52ee3066d5
| | | * | | | Allow uninstallable APPs.Ying Wang2011-09-071-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5264671 This is needed by cts tests. It's harmless to existing modules. Change-Id: I0083471f80d483559b27523d4b88190d7913f6f1
* | | | | | | Merge "Provide LOCAL_RENDERSCRIPT_TARGET_API override."Ying Wang2011-09-082-8/+8
|\ \ \ \ \ \ \
| * | | | | | | Provide LOCAL_RENDERSCRIPT_TARGET_API override.Stephen Hines2011-08-292-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "Discard hidden files when rounding up resource."Ying Wang2011-09-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Discard hidden files when rounding up resource.Ying Wang2011-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge "save uid/gid/mode information of boot and recovery files"Doug Zongker2011-09-081-3/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | save uid/gid/mode information of boot and recovery filesDoug Zongker2011-09-071-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge "Enable 'make traceview' under Windows."Raphael2011-09-081-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Enable 'make traceview' under Windows.Raphael2011-09-061-0/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2b89d2ee66d0bb4a1b2bb6e4ea15d3b0419cead9
* | | | | | | | | | am 3eae5b7c: am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS BuildBrian Muramatsu2011-09-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3eae5b7c1b3197bed4c883a671cfea9d5d9570bf': Use package.apk.unaligned in CTS Build
| * | | | | | | | | am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS BuildBrian Muramatsu2011-09-021-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '08b8e0024812ea907cf3938bcd07b8dca6188eaf': Use package.apk.unaligned in CTS Build
| | * | | | | | | | am 2306106d: Use package.apk.unaligned in CTS BuildBrian Muramatsu2011-09-021-1/+1
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2306106d3e2cd774ef0b2cd782442f90c402341f': Use package.apk.unaligned in CTS Build
| | | * | | | | | | Use package.apk.unaligned in CTS BuildBrian Muramatsu2011-09-021-1/+1
| | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5252989 This prevents dexopt installation failures when trying to install CTS apks on production devices. Change-Id: I1eeb0ac567c3be3b831c8c27dee4005ec00fd7cd
| | | * | | | | | Updating version to 2.3.7 to reflect some patches.Dan Morrill2011-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6118b41a26a1ea6940758313871eb8ab83ab06a2
| | | * | | | | | Bumping version to 2.3.6 to reflect a few patches.Dan Morrill2011-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I540a3954c70502e3deac151c642d454c87a3821b
* | | | | | | | | Add ABI specific include path for NDK.Ying Wang2011-09-071-1/+2
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I37a935126b9a1e544fc5a7471cf6ca224fc89cf3
* | | | | | | | Merge "Updated dex-preopt BOOTCLASSPATH with values from init.rc Bug: 5032006"Justin Ho2011-09-061-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated dex-preopt BOOTCLASSPATH with values from init.rcJustin Ho2011-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5032006 Change-Id: I6ed7e55ec2b278c0d60ad4e17208480d05af61bc
* | | | | | | | | allow setting LOCAL_STRIP_MODULE on multi_prebuiltsDoug Zongker2011-09-061-1/+8
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4a58255381ba8a50d8f9512bf9892f5050599393
* | | | | | | | Remove pinyinIMEJustin Ho2011-09-021-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If83419336294eb56d5b96384a7bc9d9821888b02
* | | | | | | | Add image size calcuations into the scriptJustin Ho2011-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ide13a873982bae21e2b8735a235389a660abd592
* | | | | | | | Calculate system image size at build, for harvesting laterJustin Ho2011-08-311-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6bfcde0e5df3f6da453f28354839e356f9191c0e
* | | | | | | | Revert Ic7c40c50: Support to run dex-preopt on prebuilt apksJustin Ho2011-08-301-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collect some additional system image space, moving odex files to user partition on trygon-user Change-Id: If992536ff0da14cc5b9ba51811b8a0b76f1b8f83
* | | | | | | | Merge "Add filterfw.jar to standard list of java libraries to include."Eino-Ville Talvala2011-08-292-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add filterfw.jar to standard list of java libraries to include.Eino-Ville Talvala2011-08-262-2/+2
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am a1b603a5: am 4b398749: am c5033a33: Merge "x86: remove obsolete comments"Ying Wang2011-08-291-4/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'a1b603a556e338d4899a62ea37810aff81ab7fa1': x86: remove obsolete comments
| * | | | | | | am 4b398749: am c5033a33: Merge "x86: remove obsolete comments"Ying Wang2011-08-261-4/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '4b3987498eb15dc654fe572aadf53396aac36479': x86: remove obsolete comments
| | * | | | | | am c5033a33: Merge "x86: remove obsolete comments"Ying Wang2011-08-261-4/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c5033a3357b824a8285da67357a0d289750f4a72': x86: remove obsolete comments
| | | * \ \ \ \ \ Merge "x86: remove obsolete comments"Ying Wang2011-08-261-4/+0
| | | |\ \ \ \ \ \
| | | | * | | | | | x86: remove obsolete commentsChih-Wei Huang2011-08-031-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifb12892c17a50f85c7700d6413ea295a4dad7047
* | | | | | | | | | am 3db43165: am 80d41e4b: am a2cc9b22: Merge "sdk: add DLL_EXTENSION as an ↵David 'Digit' Turner2011-08-291-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | atree variable" * commit '3db43165b09defcbeebdbeddff158b4e1f85d5c4': sdk: add DLL_EXTENSION as an atree variable
| * | | | | | | | | am 80d41e4b: am a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"David 'Digit' Turner2011-08-251-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80d41e4b7555aed399c7bd23647947d7eade3fe6': sdk: add DLL_EXTENSION as an atree variable
| | * | | | | | | | am a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"David 'Digit' Turner2011-08-251-0/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a2cc9b227ae01803dfc4bc1987071fd6eee08bb6': sdk: add DLL_EXTENSION as an atree variable
| | | * | | | | | | sdk: add DLL_EXTENSION as an atree variableDavid 'Digit' Turner2011-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | resolved conflicts for merge of 6da54b6e to masterDavid 'Digit' Turner2011-08-261-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | | Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
| * | | | | | | | resolved conflicts for merge of 7be88d00 to honeycomb-plus-aospDavid 'Digit' Turner2011-08-251-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
| | * | | | | | | am 77c6261f: Merge "emulator: Enable GLES emulation libraries"David 'Digit' Turner2011-08-251-0/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '77c6261fb074d87b75d669dd9fb9ab5a12a52cc9': emulator: Enable GLES emulation libraries
| | | * | | | | | emulator: Enable GLES emulation librariesDavid 'Digit' Turner2011-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Tighten the toolchain version checkJean-Baptiste Queru2011-08-251-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3076137 Change-Id: Ibd9f1f13916e31596f94a5b0a90293995da7f2cf
* | | | | | | | | Merge "Provide mechanism to override llvm-rs-cc headers."Ying Wang2011-08-242-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Provide mechanism to override llvm-rs-cc headers.Stephen Hines2011-08-232-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I87fd496069a9dfde633e2d232e436fa5d7315cc0
* | | | | | | | | | Removing target-api option from build.jeffhao2011-08-231-17/+0
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is cherry-picked from dalvik-dev. Change-Id: I85cd23c08fcad400e6426cdaad079e91dcd9babf
* | | | | | | | | am cfdfad3f: am 807c7980: am 7d9fe517: Merge "Add sdk/rule_api to the ↵Raphael Moll2011-08-171-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows build paths." * commit 'cfdfad3fcadc8bba30f00dbe2f2e835d61cde9ef': Add sdk/rule_api to the Windows build paths.
| * | | | | | | | am 807c7980: am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths."Raphael Moll2011-08-171-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '807c79802d5e8b1613bf36bb780cf3250f443aa2': Add sdk/rule_api to the Windows build paths.
| | * | | | | | | am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths."Raphael Moll2011-08-171-0/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d9fe5174787a5638993a15b165bc9115c16da0f': Add sdk/rule_api to the Windows build paths.