p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,782 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

2557 Commits

Author SHA1 Message Date
rpcraig 9e43f34840 Add property_contexts to SELINUX_DEPENDS. 
This ensures there is a dependency between the root image
and changes to property_contexts file.
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

Change-Id: I9bd2c3fc44015d6013e6a1f200f8abded271654f
 2012-07-05 10:50:27 -04:00
Ed Heyl 952f55e7ae 4.1.1 
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
 2012-07-03 13:54:49 -07:00
Ying Wang 594165c17b am 9ffe27e0: am 9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build." 
* commit '9ffe27e013c84e036d5e38b02edf3ca12f7405a8':
  This property is set when HAVE_SELINUX:=true during build.
 2012-07-03 12:20:50 -07:00
Ying Wang 9ffe27e013 am 9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build." 
* commit '9e38d6bf1bf78a00d8f4288e6444be358a70a692':
  This property is set when HAVE_SELINUX:=true during build.
 2012-07-03 12:16:03 -07:00
William Roberts 9d8a51f537 This property is set when HAVE_SELINUX:=true during build. 
This will provide a convenient method for determing build
configuration when in the Java layer. For instance, this will
be used in change id I69529fb7a3adfe31eccb16d79740fc4952ff5e68
to determine if the Settings app should display the SE Linux
status.

Change-Id: Idc8dff020aaac41649eac64f5fa8e311dabbc51f
 2012-07-03 11:05:03 -07:00
Ying Wang dfb5818027 am d512fda4: am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk" 
* commit 'd512fda4ae7cc56cc9b83fcb6e7a9e0d0f02c259':
  Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
 2012-06-29 20:22:20 -07:00
Ying Wang d512fda4ae am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk" 
* commit 'e42ed0ba1571f20866609710ba7c73fd138c0405':
  Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
 2012-06-29 20:19:50 -07:00
Ying Wang 478ba5e3f0 Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk 
Bug: 6754632
So the warning won't show up when you run lunch.
Now the warning only shows when you do a clean build.

Change-Id: I7876da783f059d390f0072df37d3ab0291589eb7
 2012-06-28 16:02:19 -07:00
Steve Block d6e105bad1 Merge "Don't fail if a target of type NONE has a NOTICE file present" 2012-06-27 09:02:39 -07:00
Steve Block f55aeb0668 Don't fail if a target of type NONE has a NOTICE file present 
Targets of type NONE are used extensively in Android makefiles which have been
auto-generated from gyp build files. The gyp generator uses such targets to
represent gyp targets which don't produce an output file. Typically, many such
targets exist in a single Android makefile.

We use a generated Android makefile for Chromium. This project has a NOTICE
file, intended to be installed with a SHARED_LIBRARY target. However, the build
fails when processing the targets of type NONE, as it does not know where
to install the NOTICE file.

This change causes the NOTICE to be ignored in this case, rather than failing
the build.

Change-Id: I70cf9a406e4a1c932f8a734f53491f7c5281ee17
 2012-06-27 16:48:31 +01:00
Stephen Hines bec4a4b980 Disable libcompiler-rt-extras for BUILD_TINY_ANDROID. 
Change-Id: I05aa9e43f987ef422d98f43b3734dfbc261feb4b
 2012-06-26 16:38:21 -07:00
Jean-Baptiste Queru 471d6d8b11 am 4a65f812: am 6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI" 
* commit '4a65f812373e1ecfa6e7058d635e998429a4cf17':
  Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI
 2012-06-22 14:32:49 -07:00
Jean-Baptiste Queru 4a65f81237 am 6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI" 
* commit '6e587f53152127370c6b45204f6529dd7b0ce32a':
  Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI
 2012-06-22 14:31:05 -07:00
Ying Wang 1cc65fd6ef resolved conflicts for merge of 9b76c054 to master 
Change-Id: I4190ef6895b7ddb27d9a293cbacecdef1f4f20b8
 2012-06-19 14:33:09 -07:00
Ying Wang 9b76c054c6 am 0872a010: Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev 
* commit '0872a010659d20633f07f4ef54cf61f8e4b6e030':
  More flexibility to keep/remove R.class in static Java library
 2012-06-19 14:27:31 -07:00
Ying Wang ae25ec1bcd More flexibility to keep/remove R.class in static Java library 
- Usually you don't need to set LOCAL_JAR_EXCLUDE_FILES in your
  Android.mk, if your static library is directly used by an app.
- If your library will be included by another library that need
  reference the R/Manifest class, you can set
  LOCAL_JAR_EXCLUDE_FILES := none
  to keep the generated classes.
- If your library includes another static library that has Android
  resource and you want to remove the generated classes carried by
  the static library, set:
  LOCAL_JAR_EXCLUDE_FILES := $(ANDROID_RESOURCE_GENERATED_CLASSES)

With the LOCAL_JAR_EXCLUDE_FILES value "none", deprecate the old
long variable LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY.

Change-Id: I3b9ad5d66f0262f784feb09bc1537c5b01256258
 2012-06-19 10:40:37 -07:00
Ying Wang 3caa951610 Merge "lint support." 2012-06-19 09:23:38 -07:00
Ying Wang 0d570a7163 lint support. 
Bug: 6167394
$make lint-<app-name>       # to lint on a single module
$make lintall               # to lint on all packages in the source
                              tree.

Change-Id: I4decc76fb75793ce44809232b0ec72b766fbb434
 2012-06-18 18:45:40 -07:00
Ying Wang f02b41d42b Merge "Revert "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build"" 2012-06-18 15:29:15 -07:00
Ying Wang 692a3d598d Revert "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build" 
This reverts commit 81f0fd6cdb

The change broke the CTS build:
CTS does need the jni library embedded in the apk.
 2012-06-18 15:29:10 -07:00
Keun young Park f4d1438d85 clean up pdk_config.mk 
- define ...JAVA_ZIP_... variables only when necessary
- fix missed case for TARGET_BUILD_JAVA_SUPPORT_LEVEL definition

Change-Id: I4f491ff212fd1e973a77499bbf3fd8d1940bb1f8
 2012-06-18 14:44:54 -07:00
Ying Wang 0caa16b0d9 am 51125621: am 43ca4a45: Remove the user tag and legacy prebuilts for the srec modules. 
* commit '51125621080c64b106abaeb414676cf51c0fd9c3':
  Remove the user tag and legacy prebuilts for the srec modules.
 2012-06-18 10:52:19 -07:00
Ying Wang 5112562108 am 43ca4a45: Remove the user tag and legacy prebuilts for the srec modules. 
* commit '43ca4a45a43e2084b5a40af90ff523b0417d31c0':
  Remove the user tag and legacy prebuilts for the srec modules.
 2012-06-18 10:33:33 -07:00
Torne (Richard Coles) 596549c4d3 Merge "Make building an empty static library work." 2012-06-18 01:51:46 -07:00
Ying Wang 43ca4a45a4 Remove the user tag and legacy prebuilts for the srec modules. 
Change-Id: I20d8ec8986e2da76fbab67d1f86f5d385bd87c47
 2012-06-15 18:36:06 -07:00
Ying Wang e4ff0b0042 Merge "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build" 2012-06-15 17:36:50 -07:00
Torne (Richard Coles) bffaef246a Make building an empty static library work. 
Handle the case where a static library is not built because it has no
input files (e.g. because they are conditionally included and it happens
that the computed list is empty). Previously, ar never ran because of
split-long-arguments, and anything that depended on the static library
would fail to link. Make sure that ar runs at least once.

Change-Id: If0071d7ae50c4e45fff1772dca43187af155db1f
 2012-06-15 16:06:21 +01:00
Kito Cheng 70dc3e1d3d Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI 
Change-Id: Ia95dc7318e17c0804867b22e239edccc5cbec0af
 2012-06-15 15:16:50 +08:00
Ying Wang 81f0fd6cdb Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build 
To save space.

Change-Id: I7c88c13e4225bed89106917de57cbae74fc79ab8
 2012-06-14 15:29:20 -07:00
Jean-Baptiste Queru a9e85effdd am ffbef646: am 74aba614: Allow additional vendors 
* commit 'ffbef646d2bec4f84874bdc5940c3b060904cb3d':
  Allow additional vendors
 2012-06-14 10:34:46 -07:00
Jean-Baptiste Queru ffbef646d2 am 74aba614: Allow additional vendors 
* commit '74aba61404f0c1ea8693d2959d81d8b5b1bdf5d4':
  Allow additional vendors
 2012-06-14 09:24:18 -07:00
Jean-Baptiste Queru 74aba61404 Allow additional vendors 
Bug: 6611375
Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
 2012-06-14 09:15:20 -07:00
Ying Wang 022a7b32ef Fix arm mode for the generated protobuf code. 
Change-Id: Ic644ab9e1b83d9616dd9ca93362805cdd17f36a7
 2012-06-13 11:38:10 -07:00
Jean-Baptiste Queru 41a3fb3707 am 6e207824: resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp 
* commit '6e207824af267eea8777949ccf6d0584accd55a0':
  x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3
 2012-06-13 07:44:31 -07:00
Jean-Baptiste Queru 6e207824af resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp 
Change-Id: I6c750adcf06457bf8a3b47423c990be6e9d23bbb
 2012-06-13 07:42:04 -07:00
Jean-Baptiste Queru 3f8ff030e0 Merge "x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3" 2012-06-13 06:25:00 -07:00
Jean-Baptiste Queru 2f65e81974 am 06b1a47f: am d3d78a30: am a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries" 
* commit '06b1a47fe19699e8cb94fd6a007f82f3b41119fe':
  gcc 4.6 requires --copy-dt-needed-entries
 2012-06-12 15:56:29 -07:00
Ying Wang 8e53708ab1 Don't add COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES if we build against NDK. 
Change-Id: I732be02bb4b9ee7a2d11ed89f409487f0bc37d0f
 2012-06-12 15:52:58 -07:00
Jean-Baptiste Queru 06b1a47fe1 am d3d78a30: am a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries" 
* commit 'd3d78a30a4f8dd40fa055577ea2708ab34606cec':
  gcc 4.6 requires --copy-dt-needed-entries
 2012-06-12 15:52:54 -07:00
Stephen Hines 2897f052d4 Merge "EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds." 2012-06-12 15:38:21 -07:00
Jean-Baptiste Queru a11ad6c2b3 Merge "gcc 4.6 requires --copy-dt-needed-entries" 2012-06-12 15:24:17 -07:00
Stephen Hines c72f39664d EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds. 
Change-Id: I463217aef573a28069469514ad94cd85a7f38bea
 2012-06-12 13:34:50 -07:00
Ying Wang 6466147220 Don't build userdata.img in tests build. 
Bug: 6035501

Change-Id: Ie1a0804f7fcc54383f2d8b97ac4583000e67cec5
 2012-06-11 16:44:05 -07:00
Ying Wang e556005331 resolved conflicts for merge of 5c0ee702 to master 
Change-Id: I6bdcc87482c45988d410a4c4d0abc43a1416277e
 2012-06-08 09:37:54 -07:00
Ying Wang 5c0ee702d6 am 79d39a30: am 874563f9: Merge "Fix generic build on Max OS X 10.7 Lion" 
* commit '79d39a303e036dc70eccf2e2e7489fa0bbfd3a4b':
  Fix generic build on Max OS X 10.7 Lion
 2012-06-08 09:27:08 -07:00
SangWook Han 02eb37c267 Fix generic build on Max OS X 10.7 Lion 
Recover variable build_mac_version which is removed on
    commit 644dc16 and added on commit 9ce06f1.

    Without this, ranlib libSDL.a is executed on Lion which
    causes build fail of emulator-arm.

Change-Id: I06144a288921f8f968ef457999398c1b9152d4aa
 2012-06-08 14:55:05 +09:00
Ying Wang 10f775379d Tweak cflags for building with SDK 10.6. 
Change-Id: I4db9949577591ef6756812769f04cfaddd876faf
 2012-06-07 17:10:53 -07:00
Keun young Park 1a2c28368c am fe8cddea: am efe02ce9: add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK 
* commit 'fe8cddea28bc5a5266ede2bd10b482dbe840c0bf':
  add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
 2012-06-07 16:34:25 -07:00
Keun young Park fe8cddea28 am efe02ce9: add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK 
* commit 'efe02ce9e00b9aebde7e9b32e81780d8de8f0dbd':
  add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
 2012-06-07 16:31:14 -07:00
Keun young Park efe02ce9e0 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
 2012-06-07 15:40:53 -07:00
Raphael Moll ebde54b265 am 748f9e38: am b53a073d: am e375c940: Merge "SDK: Use "strip -x" for atree." 
* commit '748f9e3804834610a59081db4c2952dcb7ee00d4':
  SDK: Use "strip -x" for atree.
 2012-06-07 13:12:04 -07:00
Raphael Moll 748f9e3804 am b53a073d: am e375c940: Merge "SDK: Use "strip -x" for atree." 
* commit 'b53a073ddb3a5036f41ea2956792991b7a46da02':
  SDK: Use "strip -x" for atree.
 2012-06-07 13:08:58 -07:00
Raphael Moll e375c940b9 Merge "SDK: Use "strip -x" for atree." 2012-06-07 12:26:08 -07:00
Ying Wang fcc2a604af am f1e424a6: am 3da13457: am 4b030617: Merge "XCode 4.3+ compatibility check-in" 
* commit 'f1e424a63658eb15ba61ca2eb8f0df38733188fe':
  XCode 4.3+ compatibility check-in
 2012-06-07 12:03:46 -07:00
Ying Wang f1e424a636 am 3da13457: am 4b030617: Merge "XCode 4.3+ compatibility check-in" 
* commit '3da13457cfa46cf7d46b57c00f387c7c310b2dba':
  XCode 4.3+ compatibility check-in
 2012-06-07 12:02:06 -07:00
Al Sutton 51f9bb02da XCode 4.3+ compatibility check-in 
XCode 4.3 and later use a different location for SDKs. This check in
ensures the build checks for the new location as well as the old one.

Change-Id: I97884e5009f229f8b42e57a8feeb702b3a40a241
Signed-off-by: Al Sutton <al@funkyandroid.com>
 2012-06-07 19:10:13 +01:00
Nick Kralevich a46c480e43 arm: add -D_FORTIFY_SOURCE=1 to the default cflags 
Add additional compile and runtime buffer overflow detection to
Android. As of today, Android supports additional buffer overflow
detection for the following libc functions:

* memcpy
* memmove
* strcpy
* strcat
* strncpy
* strncat

Support for additional functions will be added to bionic libc in
future code changes.

Please see
    * http://gcc.gnu.org/onlinedocs/gcc/Object-Size-Checking.html
    * http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html

for information on these features.

Change-Id: I1a281a4bac20009f4730dd8d8b798fa107576230
 2012-06-07 08:55:06 -07:00
Raphael Moll ec5fe91ead SDK: Use "strip -x" for atree. 
Also fixes atree to accept an alternate command via the env var ATREE_STRIP
and correctly splits it for execvp if it contains arguments.

Change-Id: I8691bdc569bea3dddfde6249217dc305b6ef19f7
 2012-06-06 23:39:47 -07:00
Ying Wang d5ba4064c3 am f521a8e8: am 6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev 
* commit 'f521a8e888a425dcd5fff70d18d14c9324e2d3aa':
  Clean common intermediate files if overlay changed
 2012-06-06 09:47:25 -07:00
Ying Wang f521a8e888 am 6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev 
* commit '6afbda9f07821deed6eb110247ab56fb47dfc775':
  Clean common intermediate files if overlay changed
 2012-06-06 09:44:17 -07:00
Ying Wang 6afbda9f07 Merge "Clean common intermediate files if overlay changed" into jb-dev 2012-06-06 09:41:10 -07:00
Joe Onorato 049f4055a8 am d7d0afca: Add the ability in a product spec file to have modules installed for specific variants. 
* commit 'd7d0afcaea24b0fb0cb37dca921a5ff52fd2485b':
  Add the ability in a product spec file to have modules installed for specific variants.
 2012-06-05 16:06:45 -07:00
Joe Onorato d7d0afcaea Add the ability in a product spec file to have modules installed for specific variants. 
Change-Id: Ifa5eb2e15b3d3e5007378ec00efc4aec3e9a3b99
 2012-06-05 15:57:07 -07:00
Ying Wang 130ae6adcb resolved conflicts for merge of 9f4d00b9 to master 
Change-Id: I1818896ae714aa54ad980bfbf7648652369497e5
 2012-06-05 15:44:21 -07:00
Ying Wang 9f4d00b94b am e534e2eb: am 47450542: Merge "Use Mac OS X SDK 10.6." 
* commit 'e534e2eb2b5e79facf24c31eb2f60b8a0ee1f5b7':
  Use Mac OS X SDK 10.6.
 2012-06-05 15:25:39 -07:00
Ying Wang 644dc164cc Use Mac OS X SDK 10.6. 
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
 2012-06-05 14:23:22 -07:00
Ying Wang a23b91dacf Merge "Use Mac OS X SDK 10.6." 2012-06-05 11:20:54 -07:00
Jean-Baptiste Queru 359264ae03 am c9f8b8d1: am 90beb4f1: Add some known binary owners 
* commit 'c9f8b8d17ea17f722157aa58014dc1f1168996c1':
  Add some known binary owners
 2012-06-05 09:55:14 -07:00
Jean-Baptiste Queru c9f8b8d17e am 90beb4f1: Add some known binary owners 
* commit '90beb4f155f9e0a7508854ded5b2c3dd87d702f5':
  Add some known binary owners
 2012-06-05 08:23:19 -07:00
Jean-Baptiste Queru 90beb4f155 Add some known binary owners 
Bug: 6611375
Change-Id: I082128ad15b277ced82c8530c17186842839a557
 2012-06-05 08:08:06 -07:00
Ying Wang 71004f8135 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
 2012-06-04 18:02:55 -07:00
Ying Wang 94539b152e am 0fb728b6: am 28a18175: Don\'t use .. to reference the target file. 
* commit '0fb728b65ab2199e0273af1217711aa46d6504c6':
  Don't use .. to reference the target file.
 2012-06-02 09:28:34 -07:00
Ying Wang 0fb728b65a am 28a18175: Don\'t use .. to reference the target file. 
* commit '28a181759079c34f8776f98f553e56554b527069':
  Don't use .. to reference the target file.
 2012-06-02 09:26:47 -07:00
Ying Wang 28a1817590 Don't use .. to reference the target file. 
Change-Id: I1d08db81c37853f5bf0bdf5dbe848634e6ae9f61
 2012-06-02 09:22:31 -07:00
Wink Saville 93aec1fa33 am 84690f96: am f97105ea: Merge "Fix rild running in Nakasi." into jb-dev 
* commit '84690f969e993ca712d028b9acfb0a7c17c08c44':
  Fix rild running in Nakasi.
 2012-05-31 13:27:55 -07:00
Wink Saville 84690f969e am f97105ea: Merge "Fix rild running in Nakasi." into jb-dev 
* commit 'f97105ea898fd4ad83ca55e391c0d512e3497b9b':
  Fix rild running in Nakasi.
 2012-05-31 13:25:41 -07:00
Wink Saville f97105ea89 Merge "Fix rild running in Nakasi." into jb-dev 2012-05-31 13:21:34 -07:00
Wink Saville 689f117b63 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
 2012-05-31 10:35:52 -07:00
Ying Wang abf72cf3f4 Use Mac OS X SDK 10.6. 
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
 2012-05-30 18:16:10 -07:00
Keun young Park ca7d27212e am dd8fe390: am 36e4e050: Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev 
* commit 'dd8fe390ae9244398b41d23adfb42dbaa9804599':
  add add-to-product-copy-files-if-exists for pdk
 2012-05-30 16:16:20 -07:00
Keun young Park dd8fe390ae am 36e4e050: Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev 
* commit '36e4e050ff52956fc4afe60c156e81c2016304c4':
  add add-to-product-copy-files-if-exists for pdk
 2012-05-30 16:13:43 -07:00
Keun young Park 36e4e050ff Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev 2012-05-30 16:11:06 -07:00
Keun young Park c41c5f4e46 add add-to-product-copy-files-if-exists for pdk 
Change-Id: Ib35006824de81be31652bfff220bbe4e814869ce
 2012-05-30 16:03:24 -07:00
Jeff Brown 645020913c am 0e18fc47: am 01efddb0: Make make make faster. 
* commit '0e18fc47b6181df7d354860095453475c7ecfca0':
  Make make make faster.
 2012-05-30 15:05:48 -07:00
Jeff Brown 0e18fc47b6 am 01efddb0: Make make make faster. 
* commit '01efddb0b8c641a9ebfd955173dd58e015fbe903':
  Make make make faster.
 2012-05-30 15:02:56 -07:00
Jeff Brown 01efddb0b8 Make make make faster. 
Optimize common case of uniq-words where the word is not
actually duplicated.  Reduces make startup overhead.

Change-Id: I1bee13bbd08a7b01248f4452283a64a724663d02
 2012-05-30 13:52:22 -07:00
Keun young Park 979bf12816 am 2e64f64c: am 3e93aeae: add platform.zip from platform-java to dist 
* commit '2e64f64c9bc1cc8cbf0f59723b78a278dec66b3b':
  add platform.zip from platform-java to dist
 2012-05-29 18:32:33 -07:00
Keun young Park 2e64f64c9b am 3e93aeae: add platform.zip from platform-java to dist 
* commit '3e93aeae10aa70ab64e78fbab0bb8741d0b04d99':
  add platform.zip from platform-java to dist
 2012-05-29 18:28:00 -07:00
Keun young Park 3e93aeae10 add platform.zip from platform-java to dist 
Change-Id: I08e110edf70ef5ec313ee02e03803fa152f0aa6a
 2012-05-29 18:13:39 -07:00
Ying Wang 1dfdbc95d1 am a9b484ad: am 82eb7082: Fix typo. 
* commit 'a9b484ad0ee562225282098b701fe3696ad04bec':
  Fix typo.
 2012-05-29 13:47:00 -07:00
Ying Wang a9b484ad0e am 82eb7082: Fix typo. 
* commit '82eb7082aa9b7239770f1631211a3c18b6daacfe':
  Fix typo.
 2012-05-29 13:44:13 -07:00
Ying Wang 82eb7082aa Fix typo. 
Change-Id: Id4b619e3fff8d801c4662d9cb2719576c370a503
 2012-05-29 13:42:18 -07:00
Ying Wang 9d50defb8b Revert "Use Mac OS X SDK 10.6." 
This reverts commit 4c1b310b9b
 2012-05-25 18:55:52 -07:00
Ying Wang 4c1b310b9b Use Mac OS X SDK 10.6. 
Change-Id: Ie36914ab1763c5606111f7501c97ed97517e7187
 2012-05-25 15:43:38 -07:00
Keun young Park ebfe97a558 am f89cd668: am d8de82fb: ignore touch error happening from broken symbolic link 
* commit 'f89cd6689c6d39303e61dca88d0f84f8c8fea662':
  ignore touch error happening from broken symbolic link
 2012-05-25 14:07:47 -07:00
Keun young Park f89cd6689c am d8de82fb: ignore touch error happening from broken symbolic link 
* commit 'd8de82fbca4371ccefb41e02ac737e3a153901b3':
  ignore touch error happening from broken symbolic link
 2012-05-25 14:04:35 -07:00
Keun young Park d8de82fbca 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
 2012-05-25 12:22:22 -07:00
Bruce Beare c3192b3164 x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3 
Change-Id: I0576514621affefea86a14d419f428761a60e067
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2012-05-25 09:59:25 -07:00
Bruce Beare 52b63178d9 gcc 4.6 requires --copy-dt-needed-entries 
Change-Id: Icc62106e0f2e96f4cd871bb4b3c46c7ca83cabec
Author: Bruce Beare <bruce.j.beare@intel.com>
Reviewed-by: Lu, Hongjiu <hongjiu.lu@intel.com>
 2012-05-25 09:27:23 -07:00
Elliott Hughes f440828fa0 Merge "Compile Mac OS binaries with unwind tables for libcorkscrew." 2012-05-24 15:21:44 -07:00
Keun young Park 97e6da8677 am 2b9a7982: am ac440901: Merge "enable PDK to use platform JAVA API" into jb-dev 
* commit '2b9a7982e1af5be28126d0ed95fa75ff195dc87f':
  enable PDK to use platform JAVA API
 2012-05-24 12:57:07 -07:00
Keun young Park 2b9a7982e1 am ac440901: Merge "enable PDK to use platform JAVA API" into jb-dev 
* commit 'ac44090133e4e3a674be831d28d6d8cc661d2472':
  enable PDK to use platform JAVA API
 2012-05-24 12:54:57 -07:00
Keun young Park ac44090133 Merge "enable PDK to use platform JAVA API" into jb-dev 2012-05-24 12:53:07 -07:00
Keun young Park 816b9fd4e2 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
 2012-05-24 11:19:31 -07:00
Elliott Hughes 468d6a584f Compile Mac OS binaries with unwind tables for libcorkscrew. 
Change-Id: I9755d8d39913830180da2ce32bcdd357309ff792
 2012-05-23 17:32:32 -07:00
Ying Wang 13054c3653 am ce21b820: am 9ccacd7a: Set PWD to the absolute path of the top tree. 
* commit 'ce21b8204d5713fd0d511cc3635719dd4ca0bf75':
  Set PWD to the absolute path of the top tree.
 2012-05-23 09:30:50 -07:00
Ying Wang ce21b8204d am 9ccacd7a: Set PWD to the absolute path of the top tree. 
* commit '9ccacd7a6f27dbb38c8365b85fb07197d1fdbb29':
  Set PWD to the absolute path of the top tree.
 2012-05-23 09:28:26 -07:00
Ying Wang 9ccacd7a6f 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
 2012-05-22 18:29:02 -07:00
Andrew Hsieh 0fc900754d am 6dfe3e11: Merge "Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86" into jb-dev-plus-aosp 
* commit '6dfe3e11a56707ce288a4dec8d3022ff61ef023f':
  Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86
 2012-05-21 18:53:49 -07:00
Andrew Hsieh 6dfe3e11a5 Merge "Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86" into jb-dev-plus-aosp 2012-05-21 18:51:52 -07:00
Jean-Baptiste Queru fed04c4c72 am 99e1613f: am 72b329e5: am 3c5191c6: Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES" 
* commit '99e1613fd5d3773387b52910d7daa86535f42e25':
  Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
 2012-05-21 14:30:47 -07:00
Andrew Hsieh 8e376fb633 am 112a6747: Add -mno-movbe to disable "movbe" instruction from code-gen 
* commit '112a674798c58052ddce94418e34f3e5a084ed1a':
  Add -mno-movbe to disable "movbe" instruction from code-gen
 2012-05-21 12:44:38 -07:00
Jean-Baptiste Queru 99e1613fd5 am 72b329e5: am 3c5191c6: Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES" 
* commit '72b329e5042b8fc15cbcbea3d382a072f79eb961':
  Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
 2012-05-21 08:10:26 -07:00
Jean-Baptiste Queru 3c5191c61a Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES" 2012-05-21 07:30:17 -07:00
Andrew Hsieh b968c85edf Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86 
Change TARGET_ARCH_VARIANT from x86-atom to x86, for the reason
that atom-specific instruciton like "movbe" isn't "generic" to
x86 Android devices and x86 host running emulator-x86, which may
crash non-atom host in VT because "movbe" isn't supported natively.

Also revert previous fix in TARGET_linux-x86.mk which conservatively
disable "movbe" across the board

Change-Id: Ief93a3585566ffae558fcdc29741e6213a048d7d
 2012-05-21 14:27:59 +08:00
Andrew Hsieh 112a674798 Add -mno-movbe to disable "movbe" instruction from code-gen 
Intruction "movbe" (move data after swapping bytes) is only available in
Intel atom.  Disable it for more general x86 devices and x86 hosts which
run emulator-x86.  Although emulator-x86 can support "movbe", most of
the time we want to run emulator-x86 with VT support for speed (with KVM
in Linux, or HAXM in Windows/MacOSX).  The presence of "movbe" can crash
emulator-x86 in VT because non-atom host doesn't have it natively.

Change-Id: I86e037900ddcb8d544f92b8d8464c8627347e560
 2012-05-18 15:53:35 +08:00
Nick Sanders 8b1b764812 am 3ccf7686: Move build.prop in factory bundle 
* commit '3ccf7686757824e5e01944a369fc54baf76f95a4':
  Move build.prop in factory bundle
 2012-05-17 23:53:01 -07:00
Nick Sanders 3ccf768675 Move build.prop in factory bundle 
Move build.prop to the root dir of the factory bundle for clearer location access.

Change-Id: Ib9a49fd46eb943a1dc5e8e112462f9d601332ca3
Signed-off-by: Nick Sanders <nsanders@google.com>
 2012-05-17 22:52:17 -07:00
Joe Onorato b30517897f Merge commit '54973dbc' into work 
Conflicts:
	core/product.mk

Change-Id: Ib5eb6be09b34bdc04602e2a35a4bf7df0ba82aad
 2012-05-17 22:15:22 -07:00
Joe Onorato 9136290afa Merge commit 'bf2e8a66' into work 
Change-Id: I5cd704eb59218b56b48d689afdff84638deeacf1
 2012-05-17 22:10:24 -07:00
Joe Onorato e1d191ee95 Add rules to build the factory bundle. 
Change-Id: I66bda914a5bd41bda7c8a4314f658924087e2bfb
 2012-05-17 20:57:35 -07:00
Joe Onorato e44705a86f Add copy-many-files macro. 
Change-Id: I327fc19bdf9c1ada18b3ba695fe4104e2a241156
 2012-05-17 20:57:35 -07:00
Jean-Baptiste Queru dacf9bfe16 am feec98b1: resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp 
* commit 'feec98b139d2ca0b0164a5e178e75ce88b8f492f':
  Use i686-linux-android-4.6 for x86 build
 2012-05-17 15:34:07 -07:00
Jean-Baptiste Queru feec98b139 resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp 
Change-Id: Ic424ff756396463b98d137f8353d4a230e806a07
 2012-05-16 13:18:39 -07:00
Ying Wang 3f7246a081 Delete unused variable. 
Change-Id: I17f0e2c0b911e505c7ddd3c9c9c56e8a38239e17
 2012-05-16 10:16:49 -07:00
Jean-Baptiste Queru 2436ea8a8c Merge "Use i686-linux-android-4.6 for x86 build" 2012-05-16 06:42:55 -07:00
Ying Wang b1a4e4e89e Delete the misleading var TARGET_OUT_STATIC_LIBRARIES. 
Which can be replaced by TARGET_OUT_INTERMEDIATE_LIBRARIES.

Change-Id: I965ff1ebe70fc3113c19e4896277c876dcedb6a5
 2012-05-15 16:12:18 -07:00
Ying Wang 03b96f54a7 am 182a7e17: am f446039e: Merge "Don\'t set or reference LOCAL_MODULE_PATH for uninstallable modules." into jb-dev 
* commit '182a7e170be196c600e968690bff675ff7ad7069':
  Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
 2012-05-15 15:22:36 -07:00
Ying Wang 182a7e170b am f446039e: Merge "Don\'t set or reference LOCAL_MODULE_PATH for uninstallable modules." into jb-dev 
* commit 'f446039efb2e4d8a520c8f83dabc375c6d1370dd':
  Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
 2012-05-15 15:20:01 -07:00
Ying Wang 6e371e426f Don't set or reference LOCAL_MODULE_PATH for uninstallable modules. 
Change-Id: I98ab2f6c0d49a87aaeeba29fdf676277e4e65592
 2012-05-15 14:31:26 -07:00
Nick Kralevich ee08fe3196 stop using a custom linker script for static executables. 
This is causing problems with making the linker relocatable.

Change-Id: I53e37fba52eabd3145130712d6e9bff074aed493
 2012-05-15 10:40:35 -07:00
Ying Wang 5983d9df11 am 6b524cf5: am 3ceecfa3: Check the well-formedness of an xml file before copying. 
* commit '6b524cf591f83d2f733c2ecafb9b987e8872a97e':
  Check the well-formedness of an xml file before copying.
 2012-05-14 19:41:54 -07:00
Ying Wang 6b524cf591 am 3ceecfa3: Check the well-formedness of an xml file before copying. 
* commit '3ceecfa3daeb187c0631a84e6ee6b4dd89f111f8':
  Check the well-formedness of an xml file before copying.
 2012-05-14 19:34:26 -07:00
Ying Wang 3ceecfa3da Check the well-formedness of an xml file before copying. 
Bug: 6491991
Change-Id: I3dbf9a7e1fefd9fea2636c78a85bae63ea8391b8
 2012-05-14 14:40:58 -07:00
H.J. Lu 402d7f3654 Use i686-linux-android-4.6 for x86 build 
Change-Id: Ibbb0a899f147013503d6830bb93050c5ae588539
Author: "H.J. Lu" <hongjiu.lu@intel.com>
 2012-05-14 08:22:27 -07:00
Dianne Hackborn 5c3873c075 Merge commit '3742983d' into manualmerge 2012-05-10 23:01:41 -07:00
Dianne Hackborn 3742983d3b JellyBean is now 4.1. 
Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f
 2012-05-10 18:57:22 -07:00
Ying Wang ef86ec540b am ffb36ede: am a1ff6290: Now current is also a valid prebuilt SDK. 
* commit 'ffb36ede8f3c785173bfcea912b4c385fce40b20':
  Now current is also a valid prebuilt SDK.
 2012-05-10 18:14:35 -07:00
Ying Wang ffb36ede8f am a1ff6290: Now current is also a valid prebuilt SDK. 
* commit 'a1ff6290e1e14d48dc42d1eacf804172c5913916':
  Now current is also a valid prebuilt SDK.
 2012-05-10 18:11:23 -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 f8d557fa77 am ba10a379: am 0ec188f1: Support to build against prebuilt current SDK in unbundled branch 
* commit 'ba10a3795d813fc61a6b40e111543434a0b5cf5f':
  Support to build against prebuilt current SDK in unbundled branch
 2012-05-10 18:01:18 -07:00
Ying Wang ba10a3795d am 0ec188f1: Support to build against prebuilt current SDK in unbundled branch 
* commit '0ec188f1c197709cf61d0de647b5220539b97322':
  Support to build against prebuilt current SDK in unbundled branch
 2012-05-10 17:58:46 -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
Nick Kralevich 0dc038075c am 9d602a70: am ecb1a565: x86: compile everything with relro / bind_now 
* commit '9d602a7005683965814823feda5aabcce5a92201':
  x86: compile everything with relro / bind_now
 2012-05-10 09:30:54 -07:00
Nick Kralevich 9d602a7005 am ecb1a565: x86: compile everything with relro / bind_now 
* commit 'ecb1a565849b40ab7aa45b7fe71e24e29a059376':
  x86: compile everything with relro / bind_now
 2012-05-10 09:24:10 -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
Kito Cheng 61c37e7a4f Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES 
Change-Id: I9ff53f51dcb57511a24765bdf6a61c000a7ce977

Signed-off-by: Kito Cheng <kito@0xlab.org>
 2012-05-09 23:54:45 +08:00
Stephen Hines 192ed892d5 am 25ceb29e: am b6956bdd: Merge "Add LLVM_AS to tools." into jb-dev 
* commit '25ceb29e001e61189590e97442f3f149b5ee3731':
  Add LLVM_AS to tools.
 2012-05-09 01:55:08 -07:00
Elliott Hughes b696e0b86a am b788e87d: am 9264e4a5: The \'localize\' tool is dead. 
* commit 'b788e87dab46387953baa046f32b1ae1802261f0':
  The 'localize' tool is dead.
 2012-05-09 01:55:06 -07:00
Stephen Hines 25ceb29e00 am b6956bdd: Merge "Add LLVM_AS to tools." into jb-dev 
* commit 'b6956bdd19242cde11b2e9c1f3941585706f3cd3':
  Add LLVM_AS to tools.
 2012-05-09 01:49:45 -07:00
Elliott Hughes b788e87dab am 9264e4a5: The \'localize\' tool is dead. 
* commit '9264e4a5f63352cd6abc3d81b18be779a33c7b10':
  The 'localize' tool is dead.
 2012-05-09 01:45:01 -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
Jean-Baptiste Queru 92fadc6fbf am 269a40d1: am b031afab: am bf3d3287: Merge "Use the same compilation flags on OS X 10.8 as 10.7" 
* commit '269a40d140753aee1e579f8179b132ffe3415150':
  Use the same compilation flags on OS X 10.8 as 10.7
 2012-05-08 11:32:54 -07:00
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 9264e4a5f6 The 'localize' tool is dead. 
Change-Id: I75c43ce064664412e45c304c15f363015c0a4697
 2012-05-07 17:33:19 -07:00
Jean-Baptiste Queru 269a40d140 am b031afab: am bf3d3287: Merge "Use the same compilation flags on OS X 10.8 as 10.7" 
* commit 'b031afab543d8bf9bb236ff4c297f5ced70f8943':
  Use the same compilation flags on OS X 10.8 as 10.7
 2012-05-07 13:59:56 -07:00
Al Sutton 35bb6422bc Use the same compilation flags on OS X 10.8 as 10.7 
Added Mountain Lion to the list of versions which don't need ranlib
and don't need the pre-Lion linker flags

Change-Id: I0c785f0c66e324af9a209520c5a5b3c9bf7df0d5
Signed-off-by: Al Sutton <al@funkyandroid.com>
 2012-05-07 09:44:28 +01: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 89898dff4e Track libnativehelper move for PDK. 
Bug: 6369821
Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160
 2012-05-04 15:36:42 -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 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 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 9e4e3b378f Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever" 2012-05-02 13:26:50 -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 48cf73bd13 Restore AOSP-style version numbers - do not merge 
Change-Id: I70e3568a78feed4ff69bcdbf4fe2bd13f5211b4c
 2012-05-01 08:48:04 -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
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 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
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
Jean-Baptiste Queru 4e82d1fa7f On linux, always use the prebuilt host toolchain 
Change-Id: I8077c4780e1e3540e5e2133cf0ffa61d474d3acc
 2012-04-20 19:04:56 -07:00
Keun young Park ebb351e1b3 enable Java build for PDK build 
- Highest LOCAL_SDK_VERSION forced for package build / java library build

Bug: 6352960
Change-Id: I4a26bf26a51b95fb97c8b2adc9d32a543832c708
 2012-04-20 16:34:33 -07:00
Keun young Park e661e35829 Merge "Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK"" 2012-04-20 16:20:42 -07:00
Keun young Park b9566c0221 Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK" 
This reverts commit 9283168e61
 2012-04-20 16:18:34 -07:00
Jean-Baptiste Queru a50ef1c124 Switch to new locations of toolchains 
Change-Id: I15a8be11b3d0f1985ffd97dd51a1af18e1ce7b67
 2012-04-20 16:15:42 -07:00
Colin Cross d71a7f7bc8 Merge "Move pdk fusion platform.zip file under vendor/pdk" 2012-04-20 15:44:29 -07:00
Keun young Park 27f8946d2d Merge "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK" 2012-04-20 12:02:34 -07:00
Keun young Park 9283168e61 enable Java build for PDK build 
- Highest LOCAL_SDK_VERSION forced for package build / java library build
- uses prebuilt tools for PDK

Bug: 6352960
Change-Id: Ibb5162a16aa8151a1675baac14adb0cdfc13592d
 2012-04-20 10:07:31 -07:00
Jing Yu c856e31523 Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields. 
http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
http://gcc.gnu.org/ml/gcc-patches/2011-11/msg01390.html

-fstrict-volatile-bitfields is set on by default on gcc-4.6
for ARM target. This causes an inline asm() error. While
upstream gcc community is working on the patch, we shut
off this option temporarily.

This patch does not affect gcc-4.4.3 build.

Change-Id: Id7016dc5856a516e10f2617232945034728a74ab
 2012-04-20 07:53:16 -07:00
Doug Kwan 422a3650d3 Fix build problems with gcc-4.6.x. 
Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
 2012-04-20 07:52:47 -07:00
Colin Cross b01807b36d Merge changes I9a390206,If3e9e846 
* changes:
  build: separate dist tools and ota tools
  build: remove unused ota tools
 2012-04-19 17:15:44 -07:00
Jean-Baptiste Queru 700741cf45 Merge "Use an https URL" 2012-04-19 15:06:10 -07:00
Jean-Baptiste Queru 5d4bcb490e Use an https URL 
Change-Id: I9842d009b852df1882eaddb1bd53b216da0f4650
 2012-04-19 14:53:27 -07:00
Colin Cross c312f31871 build: separate dist tools and ota tools 
aapt is not needed for a dist build and not available in a pdk dist
build.  Create a new list DISTTOOLS that dist builds depends on,
and change OTATOOLS to be DISTTOOLS plus aapt, which is build by
make otatools.

Change-Id: I9a39020640b0e2cade8073aa14ee2ada9a20d78b
 2012-04-19 13:54:39 -07:00