Jean-Baptiste Queru
e11abdbe57
am 76cc34ca: am 6dfbf024: am 9e4e3b37: Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"
...
* commit '76cc34ca0adefac91f90fae478f2c6140e41e088':
TARGET_linux-arm.mk: use single slash version of -print-whatever
2012-05-02 17:07:09 -07:00
Jean-Baptiste Queru
76cc34ca0a
am 6dfbf024: am 9e4e3b37: Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"
...
* commit '6dfbf0240b77acaf7d6b650b4c206deb29337e7b':
TARGET_linux-arm.mk: use single slash version of -print-whatever
2012-05-02 17:05:04 -07:00
Jean-Baptiste Queru
6dfbf0240b
am 9e4e3b37: Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"
...
* commit '9e4e3b378fd9a62651e216f18dc26cf2b877412a':
TARGET_linux-arm.mk: use single slash version of -print-whatever
2012-05-02 17:03:12 -07:00
Jean-Baptiste Queru
ad6c6b69ee
am 5af27de0: resolved conflicts for merge of 343597c3 to jb-dev-plus-aosp
...
* commit '5af27de0b59b3a49298066a652d9fa37ff71cbf0':
Enable sound effect support in the SDK system image
2012-05-02 15:31:49 -07:00
Jean-Baptiste Queru
5af27de0b5
resolved conflicts for merge of 343597c3 to jb-dev-plus-aosp
...
Change-Id: I84648a8044e6238a57b4a08a261146bfa3c8c1c7
2012-05-02 15:24:32 -07:00
Joe Onorato
49eb72c94d
am 8ad4bb16: Turn off adb on user builds.
...
* commit '8ad4bb16a0d8b8ff9b4d17e860db336111bef34d':
Turn off adb on user builds.
2012-05-02 14:50:06 -07:00
Joe Onorato
8ad4bb16a0
Turn off adb on user builds.
...
Tungsten is the first device we have done since post_process_props.py
and UsbDeviceManager were added that by default has no services running
on usb. Everything else has mtp. This makes it so we always populate
the property with something.
Change-Id: Ic24f52462ed8866e87499c715dd21937e5b1128d
2012-05-02 14:36:57 -07:00
Jean-Baptiste Queru
cd742a991e
am 9bdc2907: am 8571ee47: am f562adc8: Merge "Force use of compatibility compilers on Apple\'s command line tools"
...
* commit '9bdc290792f8c5c4e4beb40e6b7f335759b6d6d5':
Force use of compatibility compilers on Apple's command line tools
2012-05-02 14:21:06 -07:00
Jean-Baptiste Queru
01a2b439ef
am 6ed1beed: am a4354dd8: am 2ba46ecd: Merge "Add Esperanto to the list of locales"
...
* commit '6ed1beed3db82cf4ecf081ea23251e79c076aad5':
Add Esperanto to the list of locales
2012-05-02 14:21:05 -07:00
Jean-Baptiste Queru
9bdc290792
am 8571ee47: am f562adc8: Merge "Force use of compatibility compilers on Apple\'s command line tools"
...
* commit '8571ee478ee352827ec37460d23e6e0dbb1e96db':
Force use of compatibility compilers on Apple's command line tools
2012-05-02 14:18:28 -07:00
Jean-Baptiste Queru
6ed1beed3d
am a4354dd8: am 2ba46ecd: Merge "Add Esperanto to the list of locales"
...
* commit 'a4354dd8ce98320a1e6ca895dc049b82c8e1fa46':
Add Esperanto to the list of locales
2012-05-02 14:18:27 -07:00
Jean-Baptiste Queru
9e4e3b378f
Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"
2012-05-02 13:26:50 -07:00
Jean-Baptiste Queru
343597c3aa
am c45cb0bf: Merge "Enable sound effect support in the SDK system image"
...
* commit 'c45cb0bf074b6fec4e9810cfa442cf1c89645dd7':
Enable sound effect support in the SDK system image
2012-05-02 13:02:26 -07:00
Jean-Baptiste Queru
c45cb0bf07
Merge "Enable sound effect support in the SDK system image"
2012-05-02 12:20:16 -07:00
Jun Tian
07fe2cf7b4
Enable sound effect support in the SDK system image
...
Add the missing configuration in sdk.mk to support sound effect in the SDK building.
This patch can fix the CTS sound effect failues of media test in emulator system image.
Change-Id: I8c22e62201d48c2e56fb4c105795bb96ded8f34d
2012-05-02 12:18:52 -07:00
Jean-Baptiste Queru
8571ee478e
am f562adc8: Merge "Force use of compatibility compilers on Apple\'s command line tools"
...
* commit 'f562adc85f05b17c2c10993f3da07e61a7a24b74':
Force use of compatibility compilers on Apple's command line tools
2012-05-02 11:27:36 -07:00
Jean-Baptiste Queru
a4354dd8ce
am 2ba46ecd: Merge "Add Esperanto to the list of locales"
...
* commit '2ba46ecdc4bca804ffedc38694910dc1322b42d1':
Add Esperanto to the list of locales
2012-05-02 11:27:35 -07:00
Jean-Baptiste Queru
f562adc85f
Merge "Force use of compatibility compilers on Apple's command line tools"
2012-05-02 09:40:13 -07:00
Jean-Baptiste Queru
2ba46ecdc4
Merge "Add Esperanto to the list of locales"
2012-05-02 07:39:16 -07:00
Al Sutton
0d07c732c7
Force use of compatibility compilers on Apple's command line tools
...
The cc and c++ compilers included in Apple's command line tools show some
unusual behaviour which causes the build to fail in several projects under
Xcode 4.3
This patch uses the gnu compatibility gcc and g++ compilers on OS X instead
to reduce problems, and generates an error when an llvm based compiler is
detected because they currently do not generate usable emulator executables
due to them not honouring global register variables.
Change-Id: I506c22dad3dcbd41df3c7672802a675d3655e262
Signed-off-by: Al Sutton <al@funkyandroid.com >
2012-05-02 07:11:27 -07:00
Jean-Baptiste Queru
73736db9bc
am 48cf73bd: (-s ours) Restore AOSP-style version numbers - do not merge
...
* commit '48cf73bd13e3693e6e4f92dce98f3b94a4c9760d':
Restore AOSP-style version numbers - do not merge
2012-05-01 14:38:35 -07:00
Jean-Baptiste Queru
48cf73bd13
Restore AOSP-style version numbers - do not merge
...
Change-Id: I70e3568a78feed4ff69bcdbf4fe2bd13f5211b4c
2012-05-01 08:48:04 -07:00
Ying Wang
19b03dd30c
am 3072491b: am 000e89a5: Strengthen dependencies on LOCAL_REQUIRED_MODULES
...
* commit '3072491bb3aa5c5a3abd24a16f4fba4638242d6a':
Strengthen dependencies on LOCAL_REQUIRED_MODULES
2012-04-30 16:39:22 -07:00
Ying Wang
3072491bb3
am 000e89a5: Strengthen dependencies on LOCAL_REQUIRED_MODULES
...
* commit '000e89a5b95a1d3071277ff279263204f49cbd78':
Strengthen dependencies on LOCAL_REQUIRED_MODULES
2012-04-30 16:37:11 -07:00
Ying Wang
65a086bbe2
Merge "Strengthen dependencies on LOCAL_REQUIRED_MODULES"
2012-04-30 16:34:17 -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
Ying Wang
3024d2394f
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: Idbd504fd415b488c397e67ab487a22bff4fa188e
2012-04-30 15:48:27 -07:00
Jean-Baptiste Queru
e893fc100d
am 30f6db7e: Move stuff from prebuilt/ to prebuilts/misc
...
* commit '30f6db7e31263bff6925a50343483ed86b7da352':
Move stuff from prebuilt/ to prebuilts/misc
2012-04-30 10:23:54 -07:00
Jean-Baptiste Queru
30f6db7e31
Move stuff from prebuilt/ to prebuilts/misc
...
Change-Id: Ia13f5d09b24e3540042b6924ead6c96e94983ff4
2012-04-29 11:50:18 -07:00
Robert Greenwalt
6c1ea40567
am f598c6f8: Merge "Add Development/scripts to path." into jb-dev
...
* commit 'f598c6f8cd46a1a5ff188ce51ba5b8941916526e':
Add Development/scripts to path.
2012-04-27 12:51:24 -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
Andrew Hsieh
f9613a4f73
Added BUILD_HOST_static to build statically linked executable/shared-lib
...
Statically linked executable/shared-lib (eg. SDK tools) are useful
in sandboxed environment.
In BUILD_HOST_static zipalign needs -lpthread indirectly:
zipalign->libutils.a->liblog.a->logd_write.c->pthread
Change-Id: I8fa91a937b728ccdf942c4ba199efb1e2e49da3d
2012-04-28 00:53:55 +08: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