Commit graph

2323 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Jean-Baptiste Queru
a11ad6c2b3 Merge "gcc 4.6 requires --copy-dt-needed-entries" 2012-06-12 15:24:17 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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