OSDN Git Service
Jean-Baptiste Queru [Tue, 19 Jun 2012 18:17:27 +0000 (11:17 -0700)]
Remove references to packages that don't exist any more.
Those can't be found anywhere in the build system.
Change-Id: I3b3727e7735de0dbffae930cf99a6d6ccbc79570
Guang Zhu [Mon, 18 Jun 2012 18:52:42 +0000 (11:52 -0700)]
Merge "add uiautomator into system image" into jb-dev
Guang Zhu [Fri, 15 Jun 2012 21:46:26 +0000 (14:46 -0700)]
add uiautomator into system image
this includes 2 pieces:
* uiautomator shell script
* uiautomator.jar: test runner and the automation framework
classes
source is under frameworks/testing/uiautomator
Change-Id: I237d85b8917d2451cf35362d2e34786940897921
Ying Wang [Thu, 14 Jun 2012 22:04:59 +0000 (15:04 -0700)]
Remove the user tag and legacy prebuilts for the srec modules.
Change-Id: I20d8ec8986e2da76fbab67d1f86f5d385bd87c47
Jean-Baptiste Queru [Thu, 14 Jun 2012 15:31:55 +0000 (08:31 -0700)]
Allow additional vendors
Bug:
6611375
Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
Jamie Gennis [Mon, 11 Jun 2012 19:04:24 +0000 (12:04 -0700)]
Merge "Add atrace to core.mk" into jb-dev
Jamie Gennis [Thu, 7 Jun 2012 23:40:30 +0000 (16:40 -0700)]
Add atrace to core.mk
This change adds the atrace binary and init.trace.rc to the system image for
all builds.
Bug:
6513400
Change-Id: Ib979f4b6ffe799ab56e66fc3acfad754d216c576
Eino-Ville Talvala [Fri, 8 Jun 2012 16:32:27 +0000 (09:32 -0700)]
Merge "Add LegacyCamera to SDK product" into jb-dev
Keun young Park [Thu, 7 Jun 2012 00:19:29 +0000 (17:19 -0700)]
add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
- three levels: not defined, sdk, platform
- TARGET_BUILD_PDK_JAVA_PLATFORM gives the original meaning of java platform API
supported for java.mk
- remove libexif from user tag
- libexif_jni is pulled from f/b/media
Bug:
6623618
Change-Id: I5fa085bd10f43963350c57b7f885c700de8963e5
Keun young Park [Wed, 6 Jun 2012 22:47:24 +0000 (15:47 -0700)]
Merge "add mini.mk for common configurations for mini products" into jb-dev
Keun young Park [Mon, 4 Jun 2012 17:47:31 +0000 (10:47 -0700)]
add mini.mk for common configurations for mini products
- it is used for generic pdk release
Bug:
6540216
Change-Id: I7dd21724a9484e48c66e4430cd003ffb448f075b
Ying Wang [Wed, 6 Jun 2012 16:41:10 +0000 (09:41 -0700)]
Merge "Clean common intermediate files if overlay changed" into jb-dev
Eino-Ville Talvala [Tue, 5 Jun 2012 20:53:33 +0000 (13:53 -0700)]
Add LegacyCamera to SDK product
Change-Id: I690bf0ba6435c520c3de1d6fb250ffae1ae45475
Jean-Baptiste Queru [Tue, 5 Jun 2012 15:08:03 +0000 (08:08 -0700)]
Add some known binary owners
Bug:
6611375
Change-Id: I082128ad15b277ced82c8530c17186842839a557
Ying Wang [Fri, 25 May 2012 04:05:19 +0000 (21:05 -0700)]
Clean common intermediate files if overlay changed
This change cleans the packages' intermediate files if their overlays
changed between incremental builds.
If two builds have different overlay, they will have different R
classes, and so the jar files in the common intermediate dirs can
not be shared. Therefore incremental build can't be applied.
This change detects the overlay changes on package's base.
If a package's overlay is different from the previous build, its common
intermediate dir is nuked.
This makes broader incremental builds possible.
Change-Id: I368610ebbbbc85a80f9aecd714ab22cd78da7f12
Ying Wang [Sat, 2 Jun 2012 16:22:31 +0000 (09:22 -0700)]
Don't use .. to reference the target file.
Change-Id: I1d08db81c37853f5bf0bdf5dbe848634e6ae9f61
Jean-Baptiste Queru [Sat, 2 Jun 2012 01:27:03 +0000 (18:27 -0700)]
Add Live Wallpapers to AOSP builds
Change-Id: I76df14d99fd876b765510ced8f5523e3bafce291
Wink Saville [Thu, 31 May 2012 20:21:34 +0000 (13:21 -0700)]
Merge "Fix rild running in Nakasi." into jb-dev
Wink Saville [Thu, 31 May 2012 17:35:52 +0000 (10:35 -0700)]
Fix rild running in Nakasi.
The module rild is telephony specific, since Nakasi has no radio
it shouldn't run rild. Changing the build system so rild is optional
for products that don't have telephony support.
Since rild is now optional, it is necessary to add it explicitly to
the sdk build as the sdk build is special.
Bug:
6463864
Change-Id: If944e051023b567807585fb91163a1e3f79c1024
Keun young Park [Thu, 31 May 2012 03:30:29 +0000 (20:30 -0700)]
Merge "change location of apns-conf.xml and vold.conf" into jb-dev
Keun young Park [Wed, 30 May 2012 23:32:30 +0000 (16:32 -0700)]
change location of apns-conf.xml and vold.conf
- from development/data to device/generic/goldfish/data
Change-Id: Iab7ad32b31b64f854412dd3cf23fd244a5306ed9
Keun young Park [Wed, 30 May 2012 23:11:06 +0000 (16:11 -0700)]
Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev
Keun young Park [Wed, 30 May 2012 17:22:29 +0000 (10:22 -0700)]
add add-to-product-copy-files-if-exists for pdk
Change-Id: Ib35006824de81be31652bfff220bbe4e814869ce
Jeff Brown [Wed, 30 May 2012 20:52:22 +0000 (13:52 -0700)]
Make make make faster.
Optimize common case of uniq-words where the word is not
actually duplicated. Reduces make startup overhead.
Change-Id: I1bee13bbd08a7b01248f4452283a64a724663d02
Keun young Park [Wed, 30 May 2012 00:55:46 +0000 (17:55 -0700)]
add platform.zip from platform-java to dist
Change-Id: I08e110edf70ef5ec313ee02e03803fa152f0aa6a
Ying Wang [Tue, 29 May 2012 20:42:18 +0000 (13:42 -0700)]
Fix typo.
Change-Id: Id4b619e3fff8d801c4662d9cb2719576c370a503
Keun young Park [Fri, 25 May 2012 17:52:44 +0000 (10:52 -0700)]
ignore touch error happening from broken symbolic link
- maguro platform.zip contains hdcp.keys symbolic link which is broken except env with the key
- this causes error in the touch
Bug:
6555557
Change-Id: I5f9ff5d57c87c0d3038545eeba3b553445a8493c
Keun young Park [Thu, 24 May 2012 19:53:07 +0000 (12:53 -0700)]
Merge "enable PDK to use platform JAVA API" into jb-dev
Keun young Park [Wed, 16 May 2012 17:32:41 +0000 (10:32 -0700)]
enable PDK to use platform JAVA API
- make platform-java will add necessary Java stuffs from out/target/common/
to platform.zip
- make platform works as before: no Java libraries
- normal fusion build will pick up the file, and define TARGET_BUILD_PDK_JAVA
besides TARGET_BUILD_PDK if Java stuffs are included
- For TARGET_BUILD_PDK_JAVA, java.mk does not touch LOCAL_SDK_VERSION, which will lead into
pulling non-SDK Java APIs
Bug:
6482799
Change-Id: I90b1a0b06dc774150711680a6612f2b97b9eab3f
Ying Wang [Wed, 23 May 2012 01:29:02 +0000 (18:29 -0700)]
Set PWD to the absolute path of the top tree.
Previously PWD is passed in as a shell environmental variable,
which does not point to top of the source tree if you run mm/mmm.
That in turn breaks mm/mmm if OUT_DIR_COMMON_BASE is set to an absolute
path.
Change-Id: Iac99d5668aee1bbd3cb9897750afc2149bd9f973
James Dong [Tue, 15 May 2012 07:45:19 +0000 (00:45 -0700)]
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug:
6502980
Change-Id: I02a735ff4897ed386fe9c5d886260b1363a1e019
Ying Wang [Tue, 15 May 2012 22:16:33 +0000 (15:16 -0700)]
Merge "Don't set or reference LOCAL_MODULE_PATH for uninstallable modules." into jb-dev
James Dong [Tue, 15 May 2012 21:47:37 +0000 (14:47 -0700)]
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"
Fixed the broken build first.
This reverts commit
e85f05be147bf7d916d1b1622f6f3038dac8913b.
Ying Wang [Tue, 15 May 2012 21:31:26 +0000 (14:31 -0700)]
Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
Change-Id: I98ab2f6c0d49a87aaeeba29fdf676277e4e65592
James Dong [Tue, 15 May 2012 07:45:19 +0000 (00:45 -0700)]
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug:
6328360
Change-Id: Ia320d417497bc410f99f8ff7f11c727d1299afba
Ying Wang [Mon, 14 May 2012 21:39:00 +0000 (14:39 -0700)]
Check the well-formedness of an xml file before copying.
Bug:
6491991
Change-Id: I3dbf9a7e1fefd9fea2636c78a85bae63ea8391b8
Victoria Lease [Fri, 11 May 2012 23:51:47 +0000 (16:51 -0700)]
Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
Doug Zongker [Fri, 11 May 2012 16:20:50 +0000 (09:20 -0700)]
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
Dianne Hackborn [Thu, 10 May 2012 05:14:37 +0000 (22:14 -0700)]
JellyBean is now 4.1.
Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f
Ying Wang [Fri, 11 May 2012 01:07:33 +0000 (18:07 -0700)]
Now current is also a valid prebuilt SDK.
Change-Id: Id05d20f17a4b46e19df88516f50e58f6cdb62c1c
Ying Wang [Fri, 11 May 2012 00:25:51 +0000 (17:25 -0700)]
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
Jean-Michel Trivi [Thu, 10 May 2012 16:54:41 +0000 (09:54 -0700)]
Merge "Add OMX IL FLAC encoder library" into jb-dev
Jean-Michel Trivi [Fri, 27 Apr 2012 20:38:17 +0000 (13:38 -0700)]
Add OMX IL FLAC encoder library
Bug
5525503
Add the software FLAC encoder OMX IL wrapper to the build.
Change-Id: Iac69558088934e0db41e9cc7fa3fab7e72348568
Nick Kralevich [Wed, 9 May 2012 21:49:04 +0000 (14:49 -0700)]
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
233d460f21d372f964f8078b8b0d5fd17af7c6b6.
This change enables it for x86.
Change-Id: Ib90704f2fecffcfdc3587607112804faa0e16385
Stephen Hines [Wed, 9 May 2012 01:47:43 +0000 (18:47 -0700)]
Merge "Add LLVM_AS to tools." into jb-dev
Stephen Hines [Wed, 9 May 2012 01:43:48 +0000 (18:43 -0700)]
Add LLVM_AS to tools.
Change-Id: If9b4900e743b9efbf4b12eee4ed5e713ce82db9b
Victoria Lease [Tue, 8 May 2012 16:28:34 +0000 (09:28 -0700)]
Parse external/cibu-fonts/fonts.mk.
Bug:
6232193
Change-Id: I5a4b1077440ce9ab5bc504d5b2fca1a9648cc084
Jeff Brown [Tue, 8 May 2012 02:30:00 +0000 (19:30 -0700)]
Merge "Add keyboard layout package to build." into jb-dev
Jeff Brown [Tue, 8 May 2012 02:08:32 +0000 (19:08 -0700)]
Add keyboard layout package to build.
Bug:
6110399
Change-Id: Ifb1d0126359750699244e481b49bbaf49371b7ae
Jean-Michel Trivi [Tue, 8 May 2012 00:47:10 +0000 (17:47 -0700)]
Merge "Make audio downmixer part of the core platform" into jb-dev
Elliott Hughes [Tue, 8 May 2012 00:33:19 +0000 (17:33 -0700)]
The 'localize' tool is dead.
Change-Id: I75c43ce064664412e45c304c15f363015c0a4697
Jean-Michel Trivi [Tue, 8 May 2012 00:10:12 +0000 (17:10 -0700)]
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
Elliott Hughes [Fri, 4 May 2012 23:48:37 +0000 (16:48 -0700)]
Merge "Track libnativehelper move for PDK." into jb-dev
Vikram Aggarwal [Fri, 4 May 2012 23:39:14 +0000 (16:39 -0700)]
Merge "Fix the build. Exchange -> Exchange2" into jb-dev
Vikram Aggarwal [Fri, 4 May 2012 23:34:27 +0000 (16:34 -0700)]
Fix the build. Exchange -> Exchange2
Change-Id: I70b479b69ea60a60ee3725344aa410c6e4f9d6b7
Elliott Hughes [Thu, 3 May 2012 23:37:40 +0000 (16:37 -0700)]
Track libnativehelper move for PDK.
Bug:
6369821
Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160
Doug Zongker [Thu, 3 May 2012 23:15:29 +0000 (16:15 -0700)]
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
Ying Wang [Mon, 30 Apr 2012 22:48:27 +0000 (15:48 -0700)]
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
Robert Greenwalt [Fri, 27 Apr 2012 18:55:06 +0000 (11:55 -0700)]
Merge "Add Development/scripts to path." into jb-dev
Robert Greenwalt [Fri, 27 Apr 2012 17:02:37 +0000 (10:02 -0700)]
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
Colin Cross [Fri, 27 Apr 2012 00:04:54 +0000 (17:04 -0700)]
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
Ying Wang [Thu, 26 Apr 2012 19:26:33 +0000 (12:26 -0700)]
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
Nick Kralevich [Thu, 26 Apr 2012 18:38:51 +0000 (11:38 -0700)]
Merge "ARM: compile everything with relro / bind_now." into jb-dev
Nick Kralevich [Thu, 26 Apr 2012 16:09:24 +0000 (09:09 -0700)]
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
James Dong [Thu, 26 Apr 2012 01:09:34 +0000 (18:09 -0700)]
Build libstagefright_soft_mpeg4enc.so by default
o related-to-bug:
6401068
Change-Id: I3114d4b817acc85a6982d03ef3b161141413a079
James Dong [Wed, 25 Apr 2012 01:02:49 +0000 (18:02 -0700)]
Merge "Build libstagefright_soft_h264enc by default"
Ying Wang [Wed, 25 Apr 2012 00:12:43 +0000 (17:12 -0700)]
Fix pdk build.
The pdk builds don't have access to development.
Change-Id: Ie7e9f8d24b788749481465311e64145e175b8c4f
Raphael Moll [Tue, 24 Apr 2012 22:43:28 +0000 (15:43 -0700)]
resolved conflicts for merge of
4a6e8b95 to master
Change-Id: I04abdad12266d7f0eb248528d9bbd35369d18413
The Android Open Source Project [Tue, 24 Apr 2012 22:19:29 +0000 (15:19 -0700)]
am
30a6d7e3: am
76f57fe3: Reconcile with ics-mr1-release
* commit '
30a6d7e3e5904c2e0a833a2adef83db6cd54e9ba':
IMM76K
IMM76J
IMM76I
IMM76H
IMM76G
IMM76F
IMM76E
Jean-Baptiste Queru [Tue, 24 Apr 2012 21:54:15 +0000 (14:54 -0700)]
am
80879a6e: (-s ours) am
695a2b3f: am
9b16b129: Merge "Switch to new locations of toolchains"
* commit '
80879a6ea4be133c222911055d83e3e43dc15be5':
Switch to new locations of toolchains
Jean-Baptiste Queru [Tue, 24 Apr 2012 21:47:45 +0000 (14:47 -0700)]
Merge
8664008c to master
Change-Id: Ia6aa11892665b8aa42e5fbc69146db251d9a8636
Jean-Baptiste Queru [Tue, 24 Apr 2012 21:31:31 +0000 (14:31 -0700)]
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.
Jean-Baptiste Queru [Tue, 24 Apr 2012 21:31:25 +0000 (14:31 -0700)]
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.
Scott Main [Tue, 24 Apr 2012 21:27:31 +0000 (14:27 -0700)]
am
4054a158: am
7a086316: am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
4054a1587a878d2c5f9dc64433bf7ae8ebbe6bd3':
Scott Main [Tue, 24 Apr 2012 21:27:30 +0000 (14:27 -0700)]
am
217a4d89: am
9041aa50: am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
217a4d896b9bd5bd91cccc8077f7ebd353538f7b':
James Dong [Tue, 24 Apr 2012 01:02:34 +0000 (18:02 -0700)]
Build libstagefright_soft_h264enc by default
related-to-bug:
6383440
Change-Id: I852941c72f9b7270ac6e5b094e4b2a0322643ac8
Scott Main [Tue, 24 Apr 2012 20:58:00 +0000 (13:58 -0700)]
am
f689b77c: am
b3d8eecd: am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
f689b77c0519f1c73006d55d8ca3ed35bfb64ad1':
Scott Main [Tue, 24 Apr 2012 20:57:59 +0000 (13:57 -0700)]
am
7291a4f7: am
27e53840: am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
7291a4f78408651d78a8ff05eda22ce3805603dd':
Ying Wang [Tue, 24 Apr 2012 20:29:05 +0000 (13:29 -0700)]
Merge "Make export_includes depend on the module's definition makefile."
Colin Cross [Tue, 24 Apr 2012 19:45:47 +0000 (12:45 -0700)]
Merge "Set timestamps of files from platform.zip to current time"
Colin Cross [Tue, 24 Apr 2012 01:49:04 +0000 (18:49 -0700)]
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
Jean-Baptiste Queru [Tue, 24 Apr 2012 17:37:30 +0000 (10:37 -0700)]
Merge "On linux, always use the prebuilt host toolchain"
Ying Wang [Tue, 24 Apr 2012 04:29:18 +0000 (21:29 -0700)]
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
Jean-Baptiste Queru [Tue, 24 Apr 2012 01:27:18 +0000 (18:27 -0700)]
Whitelist audience
Change-Id: I3a39f4bdc5c52e01b7d5d187e35b6fbf770756e2
Raphael Moll [Mon, 23 Apr 2012 22:47:39 +0000 (15:47 -0700)]
am
c094c0a6: am
d0831659: Merge "Split target/product/sdk.mk into sdk.git"
* commit '
c094c0a68fe311ea671b4c95756d300bc6a540f4':
Split target/product/sdk.mk into sdk.git
Raphael Moll [Mon, 23 Apr 2012 22:43:35 +0000 (15:43 -0700)]
am
d0831659: Merge "Split target/product/sdk.mk into sdk.git"
* commit '
d0831659af544b93f3a9592a1cd4f85ff89e8635':
Split target/product/sdk.mk into sdk.git
The Android Open Source Project [Mon, 23 Apr 2012 21:42:27 +0000 (14:42 -0700)]
am
76f57fe3: Reconcile with ics-mr1-release
* commit '
76f57fe3737a5f88c536f3fe936f2343bbe3b1f3':
IMM76K
IMM76J
IMM76I
IMM76H
IMM76G
IMM76F
IMM76E
The Android Open Source Project [Mon, 23 Apr 2012 21:40:15 +0000 (14:40 -0700)]
Reconcile with ics-mr1-release
Change-Id: I7c50185d28ff8b3818d66b2e232e5e5507fa7902
Raphael Moll [Mon, 23 Apr 2012 19:44:00 +0000 (12:44 -0700)]
Merge "Split target/product/sdk.mk into sdk.git"
Jean-Baptiste Queru [Mon, 23 Apr 2012 16:25:59 +0000 (09:25 -0700)]
am
695a2b3f: am
9b16b129: Merge "Switch to new locations of toolchains"
* commit '
695a2b3fd9b68f45b6fa1065c1254f88318dd4ca':
Switch to new locations of toolchains
Jean-Baptiste Queru [Mon, 23 Apr 2012 16:23:58 +0000 (09:23 -0700)]
am
9b16b129: Merge "Switch to new locations of toolchains"
* commit '
9b16b1293255be054a84e6f39098c7a35357f636':
Switch to new locations of toolchains
Jean-Baptiste Queru [Mon, 23 Apr 2012 15:31:53 +0000 (08:31 -0700)]
Merge "Switch to new locations of toolchains"
Andrew Hsieh [Sat, 21 Apr 2012 07:54:42 +0000 (00:54 -0700)]
am
acd812d6: am
11e0192d: Merge "Add goldfish audio hw to board/generic_x86"
* commit '
acd812d6a7bce9fd44e2b5974b93c542754f78d6':
Add goldfish audio hw to board/generic_x86
Andrew Hsieh [Sat, 21 Apr 2012 07:52:28 +0000 (00:52 -0700)]
am
11e0192d: Merge "Add goldfish audio hw to board/generic_x86"
* commit '
11e0192d29459aab8f3acebaae113eece492069f':
Add goldfish audio hw to board/generic_x86
Jean-Baptiste Queru [Sat, 21 Apr 2012 02:04:56 +0000 (19:04 -0700)]
On linux, always use the prebuilt host toolchain
Change-Id: I8077c4780e1e3540e5e2133cf0ffa61d474d3acc
Andrew Hsieh [Fri, 20 Apr 2012 23:52:26 +0000 (16:52 -0700)]
Merge "Add goldfish audio hw to board/generic_x86"
Jean-Baptiste Queru [Fri, 20 Apr 2012 23:45:51 +0000 (16:45 -0700)]
am
9987dbbb: am
d0427e49: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
* commit '
9987dbbbb43ca3279ec615299fbab8a9101aa51c':
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
Jean-Baptiste Queru [Fri, 20 Apr 2012 23:45:49 +0000 (16:45 -0700)]
am
c4aa4ff3: am
810b0d8b: Merge "Fix build problems with gcc-4.6.x."
* commit '
c4aa4ff3551873c2e87a8679994d1f41f9909b0b':
Fix build problems with gcc-4.6.x.
Jean-Baptiste Queru [Fri, 20 Apr 2012 23:43:25 +0000 (16:43 -0700)]
am
d0427e49: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
* commit '
d0427e493edf2e4de2bd60fd1cc8253e9de233fd':
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
Jean-Baptiste Queru [Fri, 20 Apr 2012 23:43:23 +0000 (16:43 -0700)]
am
810b0d8b: Merge "Fix build problems with gcc-4.6.x."
* commit '
810b0d8bb4a458c5a92c0bed48b75cbf27f1410d':
Fix build problems with gcc-4.6.x.