summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove dependency of libvideoeditor_jni.so on static libs from video editor ↵James Dong2012-05-161-1/+3
| | | | | | | | engine related-to-bug: 6502980 Change-Id: I02a735ff4897ed386fe9c5d886260b1363a1e019
* Merge "Don't set or reference LOCAL_MODULE_PATH for uninstallable modules." ↵Ying Wang2012-05-151-13/+15
|\ | | | | | | into jb-dev
| * Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.Ying Wang2012-05-151-13/+15
| | | | | | | | Change-Id: I98ab2f6c0d49a87aaeeba29fdf676277e4e65592
* | Revert "Remove dependency of libvideoeditor_jni.so on static libs from video ↵James Dong2012-05-151-3/+1
| | | | | | | | | | | | | | | | editor engine" Fixed the broken build first. This reverts commit e85f05be147bf7d916d1b1622f6f3038dac8913b.
* | Remove dependency of libvideoeditor_jni.so on static libs from video editor ↵James Dong2012-05-151-1/+3
|/ | | | | | | | engine related-to-bug: 6328360 Change-Id: Ia320d417497bc410f99f8ff7f11c727d1299afba
* Check the well-formedness of an xml file before copying.Ying Wang2012-05-142-1/+13
| | | | | Bug: 6491991 Change-Id: I3dbf9a7e1fefd9fea2636c78a85bae63ea8391b8
* Merge "Parse external/cibu-fonts/fonts.mk." into jb-devVictoria Lease2012-05-111-0/+1
|\
| * Parse external/cibu-fonts/fonts.mk.Victoria Lease2012-05-081-0/+1
| | | | | | | | | | Bug: 6232193 Change-Id: I5a4b1077440ce9ab5bc504d5b2fca1a9648cc084
* | add copy of public cert used for signing to OTA packagesDoug Zongker2012-05-111-5/+48
| | | | | | | | | | | | | | | | | | | | | | When signing a file with -w (ie, an OTA package), add the file META-INF/com/android/otacert, which is a copy of the public key certificate. While this can be extracted from the CERT.RSA file, having a copy of it more easily accessible makes it easier to write tools. Bug: 6477365 Change-Id: I8cdb19536eca9a223c2b954e3f8ea0d9f3f86f02
* | JellyBean is now 4.1.Dianne Hackborn2012-05-102-3/+8
| | | | | | | | Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f
* | Now current is also a valid prebuilt SDK.Ying Wang2012-05-101-1/+1
| | | | | | | | Change-Id: Id05d20f17a4b46e19df88516f50e58f6cdb62c1c
* | Support to build against prebuilt current SDK in unbundled branchYing Wang2012-05-105-7/+12
| | | | | | | | | | | | | | | | Bug: 6465084 With this change and prebuilt current SDK checked in, you can build unbundled apps with LOCAL_SDK_VERSION current in an unbundled branch. Change-Id: I4efcee611d08a3a903bd6bf5a80de11500564206
* | Merge "Add OMX IL FLAC encoder library" into jb-devJean-Michel Trivi2012-05-101-0/+1
|\ \
| * | Add OMX IL FLAC encoder libraryJean-Michel Trivi2012-05-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug 5525503 Add the software FLAC encoder OMX IL wrapper to the build. Change-Id: Iac69558088934e0db41e9cc7fa3fab7e72348568
* | | x86: compile everything with relro / bind_nowNick Kralevich2012-05-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable relro / bind_now when compiling Android applications. This marks certain regions of memory as read-only after linking, making memory corruption security vulnerabilities are harder to exploit. See: * http://www.akkadia.org/drepper/nonselsec.pdf (section 6) * http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html relro support has been enabled for ARM since 233d460f21d372f964f8078b8b0d5fd17af7c6b6. This change enables it for x86. Change-Id: Ib90704f2fecffcfdc3587607112804faa0e16385
* | | Merge "Add LLVM_AS to tools." into jb-devStephen Hines2012-05-081-0/+1
|\ \ \
| * | | Add LLVM_AS to tools.Stephen Hines2012-05-081-0/+1
| | |/ | |/| | | | | | | Change-Id: If9b4900e743b9efbf4b12eee4ed5e713ce82db9b
* | | Merge "Add keyboard layout package to build." into jb-devJeff Brown2012-05-072-0/+2
|\ \ \
| * | | Add keyboard layout package to build.Jeff Brown2012-05-072-0/+2
| |/ / | | | | | | | | | | | | Bug: 6110399 Change-Id: Ifb1d0126359750699244e481b49bbaf49371b7ae
* | | Merge "Make audio downmixer part of the core platform" into jb-devJean-Michel Trivi2012-05-072-2/+2
|\ \ \
| * | | Make audio downmixer part of the core platformJean-Michel Trivi2012-05-072-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Add the multichannel audio downmix effect to the core platform, as it is now a core feature of the media framework. Bug 6456547 Change-Id: I35f88f6bffc131d5fe837c3767879f2536cec05b
* | | The 'localize' tool is dead.Elliott Hughes2012-05-071-1/+0
|/ / | | | | | | Change-Id: I75c43ce064664412e45c304c15f363015c0a4697
* | Merge "Track libnativehelper move for PDK." into jb-devElliott Hughes2012-05-043-2/+10
|\ \
| * | Track libnativehelper move for PDK.Elliott Hughes2012-05-043-2/+10
| |/ | | | | | | | | Bug: 6369821 Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160
* | Merge "Fix the build. Exchange -> Exchange2" into jb-devVikram Aggarwal2012-05-042-2/+2
|\ \
| * | Fix the build. Exchange -> Exchange2Vikram Aggarwal2012-05-042-2/+2
| |/ | | | | | | Change-Id: I70b479b69ea60a60ee3725344aa410c6e4f9d6b7
* | use the file uid/gid/mode saved in the target_filesDoug Zongker2012-05-031-4/+9
|/ | | | | | | | | | When building a bootable image with mkbootfs, use the set of file metadata that's stored in the target_files zip (when available), rather than whatever is built into the mkbootfs binary at the time the image is built. Bug: 6435132 Change-Id: If6c59149bdbcc9a67e5ab9161398f355bd1f511d
* Strengthen dependencies on LOCAL_REQUIRED_MODULESYing Wang2012-04-303-24/+21
| | | | | | | | | | | | | Bug: 6418863 This change expands the PRODUCT_PACKAGES with the required modules. Before this change, since the required modules are not in the PRODUCT_PACKAGES, they are not directly depended on by the image files. If the dependent is not to be included in the image but the required modules are to be included, the dependency of the image on the required modules gets lost! That would lead to build race condition. Change-Id: I0b656db1538ca43d3785dbf17364ffa88b80ac41
* Merge "Add Development/scripts to path." into jb-devRobert Greenwalt2012-04-271-1/+2
|\
| * Add Development/scripts to path.Robert Greenwalt2012-04-271-1/+2
| | | | | | | | | | | | | | | | Adding a script to there and people thought it would be nice if it were available/in seach path. bug:4208971 Change-Id: I58475f5f0149cec2485dc5bc787b5fb3cc68ba0a
* | Use split-long-arguments to touch pdk platform.zip filesColin Cross2012-04-261-1/+2
| | | | | | | | | | | | | | | | touch $(_pdk_fusion_files) is too long for some systems, use split-long-arguments to execute touch multiple times with a subset of the list of files. Change-Id: I8e8c6770936337b93e0fdf381eca8c79fd722523
* | Option to keep the generated R class in static Java libarryYing Wang2012-04-262-0/+5
| | | | | | | | | | | | | | Bug: 6404748 Set LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY to true to do that. Change-Id: Ieee3cae431e3b1484ec598312729f2c871db2315
* | Merge "ARM: compile everything with relro / bind_now." into jb-devNick Kralevich2012-04-263-381/+3
|\ \
| * | ARM: compile everything with relro / bind_now.Nick Kralevich2012-04-263-381/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable relro / bind_now when compiling Android applications. This marks certain regions of memory as read-only after linking, making memory corruption security vulnerabilities are harder to exploit. See: * http://www.akkadia.org/drepper/nonselsec.pdf (section 6) * http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html Stop using the custom linker script, which inhibits relro / bind_now support. Change-Id: Ie97ccdd2845886bbc2ba2fdd47eed0ff4b29b60b
* | Build libstagefright_soft_mpeg4enc.so by defaultJames Dong2012-04-251-0/+1
|/ | | | | | o related-to-bug: 6401068 Change-Id: I3114d4b817acc85a6982d03ef3b161141413a079
* Merge "Build libstagefright_soft_h264enc by default"James Dong2012-04-241-0/+1
|\
| * Build libstagefright_soft_h264enc by defaultJames Dong2012-04-241-0/+1
| | | | | | | | | | | | related-to-bug: 6383440 Change-Id: I852941c72f9b7270ac6e5b094e4b2a0322643ac8
* | Fix pdk build.Ying Wang2012-04-241-2/+2
| | | | | | | | | | | | The pdk builds don't have access to development. Change-Id: Ie7e9f8d24b788749481465311e64145e175b8c4f
* | resolved conflicts for merge of 4a6e8b95 to masterRaphael Moll2012-04-241-65/+3
|\ \ | | | | | | | | | Change-Id: I04abdad12266d7f0eb248528d9bbd35369d18413
| * \ am c094c0a6: am d0831659: Merge "Split target/product/sdk.mk into sdk.git"Raphael Moll2012-04-231-62/+3
| |\ \ | | | | | | | | | | | | | | | | * commit 'c094c0a68fe311ea671b4c95756d300bc6a540f4': Split target/product/sdk.mk into sdk.git
| | * \ am d0831659: Merge "Split target/product/sdk.mk into sdk.git"Raphael Moll2012-04-231-62/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'd0831659af544b93f3a9592a1cd4f85ff89e8635': Split target/product/sdk.mk into sdk.git
| | | * \ Merge "Split target/product/sdk.mk into sdk.git"Raphael Moll2012-04-231-62/+3
| | | |\ \
| | | | * | Split target/product/sdk.mk into sdk.gitRaphael Moll2012-04-201-62/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes target/product/sdk.mk so that the list of tools and libs to build for the SDK be actually defined in both sdk.git and development.git. Depends on dev.git change I6bbc6644a and sdk.git change Id270eba6 Change-Id: I790df85ea8620f73c769aec0f92f474de60b63f9
* | | | | | am 30a6d7e3: am 76f57fe3: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-04-240-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '30a6d7e3e5904c2e0a833a2adef83db6cd54e9ba': IMM76K IMM76J IMM76I IMM76H IMM76G IMM76F IMM76E
| * | | | | am 76f57fe3: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-04-230-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '76f57fe3737a5f88c536f3fe936f2343bbe3b1f3': IMM76K IMM76J IMM76I IMM76H IMM76G IMM76F IMM76E
| | * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-04-230-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I7c50185d28ff8b3818d66b2e232e5e5507fa7902
| | | * | | | IMM76KThe Android Automerger2012-04-201-1/+1
| | | | | | |
| | | * | | | IMM76JThe Android Automerger2012-04-191-1/+1
| | | | | | |
| | | * | | | IMM76IThe Android Automerger2012-04-131-1/+1
| | | | | | |
| | | * | | | IMM76HThe Android Automerger2012-04-051-1/+1
| | | | | | |
generated by cgit v1.1 at 2024-10-26 23:31:46 +0000