Commit Graph

2598 Commits

Author SHA1 Message Date
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