Commit Graph

8504 Commits

Author SHA1 Message Date
Doug Zongker 7bb042317a add copy of public cert used for signing to OTA packages
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
2012-05-11 09:22:29 -07:00
Dianne Hackborn 3742983d3b JellyBean is now 4.1.
Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f
2012-05-10 18:57:22 -07:00
Ying Wang a1ff6290e1 Now current is also a valid prebuilt SDK.
Change-Id: Id05d20f17a4b46e19df88516f50e58f6cdb62c1c
2012-05-10 18:07:33 -07:00
Ying Wang 0ec188f1c1 Support to build against prebuilt current SDK in unbundled branch
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
2012-05-10 17:40:49 -07:00
Jean-Michel Trivi 0c5db81fb2 Merge "Add OMX IL FLAC encoder library" into jb-dev 2012-05-10 09:54:41 -07:00
Jean-Michel Trivi b8bc852d5d Add OMX IL FLAC encoder library
Bug 5525503

Add the software FLAC encoder OMX IL wrapper to the build.

Change-Id: Iac69558088934e0db41e9cc7fa3fab7e72348568
2012-05-09 16:00:11 -07:00
Nick Kralevich ecb1a56584 x86: compile everything with relro / bind_now
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 233d460f21.
This change enables it for x86.

Change-Id: Ib90704f2fecffcfdc3587607112804faa0e16385
2012-05-09 14:49:04 -07:00
Stephen Hines b6956bdd19 Merge "Add LLVM_AS to tools." into jb-dev 2012-05-08 18:47:43 -07:00
Stephen Hines 7e48e404b1 Add LLVM_AS to tools.
Change-Id: If9b4900e743b9efbf4b12eee4ed5e713ce82db9b
2012-05-08 18:43:48 -07:00
Jeff Brown 8c1028d45c Merge "Add keyboard layout package to build." into jb-dev 2012-05-07 19:30:00 -07:00
Jeff Brown b2d926898c Add keyboard layout package to build.
Bug: 6110399
Change-Id: Ifb1d0126359750699244e481b49bbaf49371b7ae
2012-05-07 19:11:06 -07:00
Jean-Michel Trivi 0acb2064d7 Merge "Make audio downmixer part of the core platform" into jb-dev 2012-05-07 17:47:10 -07:00
Elliott Hughes 9264e4a5f6 The 'localize' tool is dead.
Change-Id: I75c43ce064664412e45c304c15f363015c0a4697
2012-05-07 17:33:19 -07:00
Jean-Michel Trivi d3763c4214 Make audio downmixer part of the core platform
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
2012-05-07 17:10:12 -07:00
Elliott Hughes 8e67348b51 Merge "Track libnativehelper move for PDK." into jb-dev 2012-05-04 16:48:37 -07:00
Vikram Aggarwal aa6ffd7595 Merge "Fix the build. Exchange -> Exchange2" into jb-dev 2012-05-04 16:39:14 -07:00
Vikram Aggarwal e396df8cb5 Fix the build. Exchange -> Exchange2
Change-Id: I70b479b69ea60a60ee3725344aa410c6e4f9d6b7
2012-05-04 16:34:27 -07:00
Elliott Hughes 89898dff4e Track libnativehelper move for PDK.
Bug: 6369821
Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160
2012-05-04 15:36:42 -07:00
Doug Zongker fffe1d5e9c use the file uid/gid/mode saved in the target_files
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
2012-05-03 16:15:29 -07:00
Ying Wang 000e89a5b9 Strengthen dependencies on LOCAL_REQUIRED_MODULES
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
2012-04-30 16:32:25 -07:00
Robert Greenwalt f598c6f8cd Merge "Add Development/scripts to path." into jb-dev 2012-04-27 11:55:06 -07:00
Robert Greenwalt 0987f03d52 Add Development/scripts to path.
Adding a script to there and people thought it would be nice if it were
available/in seach path.

bug:4208971
Change-Id: I58475f5f0149cec2485dc5bc787b5fb3cc68ba0a
2012-04-27 10:02:37 -07:00
Colin Cross f8dc89b49a Use split-long-arguments to touch pdk platform.zip files
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
2012-04-26 17:04:54 -07:00
Ying Wang 83dbd2f158 Option to keep the generated R class in static Java libarry
Bug: 6404748
Set LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY to true to do that.

Change-Id: Ieee3cae431e3b1484ec598312729f2c871db2315
2012-04-26 12:27:38 -07:00
Nick Kralevich 486cca44a3 Merge "ARM: compile everything with relro / bind_now." into jb-dev 2012-04-26 11:38:51 -07:00
Nick Kralevich 233d460f21 ARM: compile everything with relro / bind_now.
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
2012-04-26 09:09:24 -07:00
James Dong a69e6194da Build libstagefright_soft_mpeg4enc.so by default
o related-to-bug: 6401068

Change-Id: I3114d4b817acc85a6982d03ef3b161141413a079
2012-04-25 18:10:19 -07:00
James Dong a56be342c2 Merge "Build libstagefright_soft_h264enc by default" 2012-04-24 18:02:49 -07:00
Ying Wang 64f642d688 Fix pdk build.
The pdk builds don't have access to development.

Change-Id: Ie7e9f8d24b788749481465311e64145e175b8c4f
2012-04-24 17:12:43 -07:00
Raphael Moll b7567ea321 resolved conflicts for merge of 4a6e8b95 to master
Change-Id: I04abdad12266d7f0eb248528d9bbd35369d18413
2012-04-24 15:43:28 -07:00
The Android Open Source Project 9a7ba63c05 am 30a6d7e3: am 76f57fe3: Reconcile with ics-mr1-release
* commit '30a6d7e3e5904c2e0a833a2adef83db6cd54e9ba':
  IMM76K
  IMM76J
  IMM76I
  IMM76H
  IMM76G
  IMM76F
  IMM76E
2012-04-24 15:19:29 -07:00
Jean-Baptiste Queru d8f9aed6e6 am 80879a6e: (-s ours) am 695a2b3f: am 9b16b129: Merge "Switch to new locations of toolchains"
* commit '80879a6ea4be133c222911055d83e3e43dc15be5':
  Switch to new locations of toolchains
2012-04-24 14:54:15 -07:00
Jean-Baptiste Queru 0cfde4016d Merge 8664008c to master
Change-Id: Ia6aa11892665b8aa42e5fbc69146db251d9a8636
2012-04-24 14:47:45 -07:00
Jean-Baptiste Queru 26e4e8c047 am 77df1f2a: am 9987dbbb: am d0427e49: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
* commit '77df1f2aeceaeabfc058a1938b672fe02a4fed93':
  Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
2012-04-24 14:31:31 -07:00
Jean-Baptiste Queru 73e6923ed2 am 7ed999aa: (-s ours) am c4aa4ff3: am 810b0d8b: Merge "Fix build problems with gcc-4.6.x."
* commit '7ed999aaf00a71d99975a4a068ba2562c0aabc88':
  Fix build problems with gcc-4.6.x.
2012-04-24 14:31:25 -07:00
Scott Main d5d2da1276 am 4054a158: am 7a086316: am 6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '4054a1587a878d2c5f9dc64433bf7ae8ebbe6bd3':
2012-04-24 14:27:31 -07:00
Scott Main 16a34c2b5a am 217a4d89: am 9041aa50: am 6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '217a4d896b9bd5bd91cccc8077f7ebd353538f7b':
2012-04-24 14:27:30 -07:00
James Dong d5177950a5 Build libstagefright_soft_h264enc by default
related-to-bug: 6383440

Change-Id: I852941c72f9b7270ac6e5b094e4b2a0322643ac8
2012-04-24 14:02:25 -07:00
Scott Main ebf37aa826 am f689b77c: am b3d8eecd: am 76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit 'f689b77c0519f1c73006d55d8ca3ed35bfb64ad1':
2012-04-24 13:58:00 -07:00
Scott Main aa4d4b9861 am 7291a4f7: am 27e53840: am 76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '7291a4f78408651d78a8ff05eda22ce3805603dd':
2012-04-24 13:57:59 -07:00
Ying Wang e5c3a09102 Merge "Make export_includes depend on the module's definition makefile." 2012-04-24 13:29:05 -07:00
Colin Cross 7e52424e4f Merge "Set timestamps of files from platform.zip to current time" 2012-04-24 12:45:47 -07:00
Colin Cross 2bea2e6565 Set timestamps of files from platform.zip to current time
Touch files unzipped from platform.zip to update their timestamp.
Prevents make dependency confusion from files with old times.

Also add a dependency for the implicit copy rule on the
pdk_fusion.stamp file to force make to use the updated
files.

Change-Id: Ia54454518d229ce3670023819836f586fef65d3f
2012-04-24 12:36:55 -07:00
Jean-Baptiste Queru fcfb41379c Merge "On linux, always use the prebuilt host toolchain" 2012-04-24 10:37:30 -07:00
Ying Wang 68f1c77a8d Make export_includes depend on the module's definition makefile.
Bug: 6383397

Note that LOCAL_MODULE_MAKEFILE is calculated in the macro my-dir,
which must be called at the beginning of your Android.mk to calculate
 LOCAL_PATH.

Change-Id: I7aa079e37253fbda25ffb85c2e5bbf0663340e27
2012-04-23 21:29:18 -07:00
Jean-Baptiste Queru e1a42cc8bf Whitelist audience
Change-Id: I3a39f4bdc5c52e01b7d5d187e35b6fbf770756e2
2012-04-23 18:27:18 -07:00
Raphael Moll 4a6e8b95e3 am c094c0a6: am d0831659: Merge "Split target/product/sdk.mk into sdk.git"
* commit 'c094c0a68fe311ea671b4c95756d300bc6a540f4':
  Split target/product/sdk.mk into sdk.git
2012-04-23 15:47:39 -07:00
Raphael Moll c094c0a68f am d0831659: Merge "Split target/product/sdk.mk into sdk.git"
* commit 'd0831659af544b93f3a9592a1cd4f85ff89e8635':
  Split target/product/sdk.mk into sdk.git
2012-04-23 15:43:35 -07:00
The Android Open Source Project 30a6d7e3e5 am 76f57fe3: Reconcile with ics-mr1-release
* commit '76f57fe3737a5f88c536f3fe936f2343bbe3b1f3':
  IMM76K
  IMM76J
  IMM76I
  IMM76H
  IMM76G
  IMM76F
  IMM76E
2012-04-23 14:42:27 -07:00
The Android Open Source Project 76f57fe373 Reconcile with ics-mr1-release
Change-Id: I7c50185d28ff8b3818d66b2e232e5e5507fa7902
2012-04-23 14:40:15 -07:00