Commit graph

8531 commits

Author SHA1 Message Date
Nick Kralevich
23e7e5ab0f armelf.xsc: delete unused file.
As of a2758f19cee0a8daf3194d8c88eeb4d078000a08 in bionic/libc,
this file is no longer needed.

Deleted.

Change-Id: Ia01868522560f022d52f5509b386eccb9bf9e4f1
2012-05-08 10:22:00 -07:00
Elliott Hughes
ceda927dff am 559ffeb2: am 8e67348b: Merge "Track libnativehelper move for PDK." into jb-dev
* commit '559ffeb2efd1a3713b715fe0590827054a3b1656':
  Track libnativehelper move for PDK.
2012-05-04 16:53:10 -07:00
Elliott Hughes
559ffeb2ef am 8e67348b: Merge "Track libnativehelper move for PDK." into jb-dev
* commit '8e67348b515636ec8314da44b3f583c5d053e81a':
  Track libnativehelper move for PDK.
2012-05-04 16:50:41 -07:00
Elliott Hughes
8e67348b51 Merge "Track libnativehelper move for PDK." into jb-dev 2012-05-04 16:48:37 -07:00
Vikram Aggarwal
8a4d1db1ad am 107339d8: am aa6ffd75: Merge "Fix the build. Exchange -> Exchange2" into jb-dev
* commit '107339d84d98260f68dd1d1c5c7666d4a79db6b4':
  Fix the build. Exchange -> Exchange2
2012-05-04 16:44:40 -07:00
Vikram Aggarwal
107339d84d am aa6ffd75: Merge "Fix the build. Exchange -> Exchange2" into jb-dev
* commit 'aa6ffd7595966808a60341a449745d3d03d88768':
  Fix the build. Exchange -> Exchange2
2012-05-04 16:42:05 -07:00
Doug Zongker
a0c3f51e39 am 2f11b071: am fffe1d5e: use the file uid/gid/mode saved in the target_files
* commit '2f11b071b7687272450133bd58d8e3ceda271b1a':
  use the file uid/gid/mode saved in the target_files
2012-05-04 16:40:29 -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
Doug Zongker
2f11b071b7 am fffe1d5e: use the file uid/gid/mode saved in the target_files
* commit 'fffe1d5e9c65dcb2321643e25d77d465f7763ba6':
  use the file uid/gid/mode saved in the target_files
2012-05-04 16:34:02 -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
Shih-wei Liao
eaa0f82295 Merge "Members in LOCAL_WHOLE_STATIC_LIBRARIES should be force_loaded." 2012-05-03 15:40:27 -07:00
Shih-wei Liao
b2680757a0 Members in LOCAL_WHOLE_STATIC_LIBRARIES should be force_loaded.
For Mac build, force_load the LOCAL_WHOLE_STATIC_LIBRARIES.

Mac has its custom linker. However, its linking rule for generating
shared libraries doesn’t take the LOCAL_WHOLE_STATIC_LIBRARIES
into consideration.

Change-Id: Ia6858bf6e2ebb334db8f3d0bdc71d7ecc0ef11c1
2012-05-03 15:38:17 -07:00
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