OSDN Git Service
Keun young Park [Thu, 7 Jun 2012 23:34:25 +0000 (16:34 -0700)]
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
Keun young Park [Thu, 7 Jun 2012 23:31:14 +0000 (16:31 -0700)]
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
Keun young Park [Thu, 7 Jun 2012 00:19:29 +0000 (17:19 -0700)]
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
Raphael Moll [Thu, 7 Jun 2012 20:12:04 +0000 (13:12 -0700)]
am
748f9e38: am
b53a073d: am
e375c940: Merge "SDK: Use "strip -x" for atree."
* commit '
748f9e3804834610a59081db4c2952dcb7ee00d4':
SDK: Use "strip -x" for atree.
Raphael Moll [Thu, 7 Jun 2012 20:08:58 +0000 (13:08 -0700)]
am
b53a073d: am
e375c940: Merge "SDK: Use "strip -x" for atree."
* commit '
b53a073ddb3a5036f41ea2956792991b7a46da02':
SDK: Use "strip -x" for atree.
Raphael Moll [Thu, 7 Jun 2012 20:06:23 +0000 (13:06 -0700)]
am
e375c940: Merge "SDK: Use "strip -x" for atree."
* commit '
e375c940b9210ea514227b0ee8cfb896d7f11d93':
SDK: Use "strip -x" for atree.
Raphael Moll [Thu, 7 Jun 2012 19:26:08 +0000 (12:26 -0700)]
Merge "SDK: Use "strip -x" for atree."
Ying Wang [Thu, 7 Jun 2012 19:03:46 +0000 (12:03 -0700)]
am
f1e424a6: am
3da13457: am
4b030617: Merge "XCode 4.3+ compatibility check-in"
* commit '
f1e424a63658eb15ba61ca2eb8f0df38733188fe':
XCode 4.3+ compatibility check-in
Ying Wang [Thu, 7 Jun 2012 19:02:06 +0000 (12:02 -0700)]
am
3da13457: am
4b030617: Merge "XCode 4.3+ compatibility check-in"
* commit '
3da13457cfa46cf7d46b57c00f387c7c310b2dba':
XCode 4.3+ compatibility check-in
Ying Wang [Thu, 7 Jun 2012 19:00:21 +0000 (12:00 -0700)]
am
4b030617: Merge "XCode 4.3+ compatibility check-in"
* commit '
4b030617e74405779c657b98fa2b2e521adf4908':
XCode 4.3+ compatibility check-in
Ying Wang [Thu, 7 Jun 2012 18:25:37 +0000 (11:25 -0700)]
Merge "XCode 4.3+ compatibility check-in"
Al Sutton [Thu, 7 Jun 2012 18:10:13 +0000 (19:10 +0100)]
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>
Nick Kralevich [Thu, 7 Jun 2012 16:45:59 +0000 (09:45 -0700)]
Merge "arm: add -D_FORTIFY_SOURCE=1 to the default cflags"
Nick Kralevich [Mon, 4 Jun 2012 22:30:24 +0000 (15:30 -0700)]
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
The Android Open Source Project [Thu, 7 Jun 2012 14:51:44 +0000 (07:51 -0700)]
am
9561c9cc: Reconcile with jb-release nakasi-factoryrom-release
* commit '
9561c9cc767ef34f692da62211c0d2488d31966c':
JRN68
JRN67D
JRN67C
JRN67B
JRN67
JRN66C
JRN66B
JRN66
JRN65B
JRN65
JRN64
JFN53N take two
JFN53N
JFN53M
JRN61B
JRN61
JFN53L
JFN53K
JRN60B
The Android Open Source Project [Thu, 7 Jun 2012 14:48:48 +0000 (07:48 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ifb66dc982a827827f324018084f0c6f191cb3769
The Android Automerger [Thu, 7 Jun 2012 14:09:17 +0000 (07:09 -0700)]
JRN68
The Android Automerger [Thu, 7 Jun 2012 13:59:31 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Raphael Moll [Thu, 7 Jun 2012 02:33:31 +0000 (19:33 -0700)]
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
The Android Automerger [Wed, 6 Jun 2012 23:50:19 +0000 (16:50 -0700)]
JRN67D
The Android Automerger [Wed, 6 Jun 2012 23:14:11 +0000 (16:14 -0700)]
JRN67C
Keun young Park [Wed, 6 Jun 2012 22:55:05 +0000 (15:55 -0700)]
am
d3da15a5: am
6aae80a8: Merge "add mini.mk for common configurations for mini products" into jb-dev
* commit '
d3da15a5eec963e03441d17725b925226c89193f':
add mini.mk for common configurations for mini products
Keun young Park [Wed, 6 Jun 2012 22:51:24 +0000 (15:51 -0700)]
am
6aae80a8: Merge "add mini.mk for common configurations for mini products" into jb-dev
* commit '
6aae80a8d500084466c7e6d90769dda9a5b20507':
add mini.mk for common configurations for mini products
Keun young Park [Wed, 6 Jun 2012 22:47:24 +0000 (15:47 -0700)]
Merge "add mini.mk for common configurations for mini products" into jb-dev
Keun young Park [Mon, 4 Jun 2012 17:47:31 +0000 (10:47 -0700)]
add mini.mk for common configurations for mini products
- it is used for generic pdk release
Bug:
6540216
Change-Id: I7dd21724a9484e48c66e4430cd003ffb448f075b
Ying Wang [Wed, 6 Jun 2012 16:47:25 +0000 (09:47 -0700)]
am
f521a8e8: am
6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev
* commit '
f521a8e888a425dcd5fff70d18d14c9324e2d3aa':
Clean common intermediate files if overlay changed
Ying Wang [Wed, 6 Jun 2012 16:44:17 +0000 (09:44 -0700)]
am
6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev
* commit '
6afbda9f07821deed6eb110247ab56fb47dfc775':
Clean common intermediate files if overlay changed
Ying Wang [Wed, 6 Jun 2012 16:41:10 +0000 (09:41 -0700)]
Merge "Clean common intermediate files if overlay changed" into jb-dev
The Android Automerger [Wed, 6 Jun 2012 16:13:38 +0000 (09:13 -0700)]
JRN67B
The Android Automerger [Wed, 6 Jun 2012 14:08:29 +0000 (07:08 -0700)]
JRN67
The Android Automerger [Wed, 6 Jun 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 5 Jun 2012 23:25:02 +0000 (16:25 -0700)]
JRN66C
Joe Onorato [Tue, 5 Jun 2012 23:06:45 +0000 (16:06 -0700)]
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.
Alon Albert [Tue, 5 Jun 2012 23:01:32 +0000 (16:01 -0700)]
am
e79fbc3b: Add support for building specific modules with mmm using the following syntax: Build all modules: mmm dir Build a single module: mmm dir:module Build multiple modules: mmm dir:module1,module2 Or in other words:
* commit '
e79fbc3bcceba381383e0bc0acbbe3df49d5682a':
Add support for building specific modules with mmm using the following syntax: Build all modules: mmm dir Build a single module: mmm dir:module Build multiple modules: mmm dir:module1,module2 Or in other words:
Joe Onorato [Tue, 5 Jun 2012 22:54:09 +0000 (15:54 -0700)]
Add the ability in a product spec file to have modules installed for specific variants.
Change-Id: Ifa5eb2e15b3d3e5007378ec00efc4aec3e9a3b99
Alon Albert [Wed, 30 Nov 2011 20:40:19 +0000 (12:40 -0800)]
Add support for building specific modules with mmm using the following syntax:
Build all modules: mmm dir
Build a single module: mmm dir:module
Build multiple modules: mmm dir:module1,module2
Or in other words:
Change-Id: I2bb91205ed31fda0cb88d8e584bbae63044962a5
Ying Wang [Tue, 5 Jun 2012 22:44:21 +0000 (15:44 -0700)]
resolved conflicts for merge of
9f4d00b9 to master
Change-Id: I1818896ae714aa54ad980bfbf7648652369497e5
Ying Wang [Tue, 5 Jun 2012 22:25:39 +0000 (15:25 -0700)]
am
e534e2eb: am
47450542: Merge "Use Mac OS X SDK 10.6."
* commit '
e534e2eb2b5e79facf24c31eb2f60b8a0ee1f5b7':
Use Mac OS X SDK 10.6.
Ying Wang [Tue, 5 Jun 2012 22:23:30 +0000 (15:23 -0700)]
am
47450542: Merge "Use Mac OS X SDK 10.6."
* commit '
47450542a3d07eb79c80035c701638b1f07eb1c0':
Use Mac OS X SDK 10.6.
Ying Wang [Tue, 5 Jun 2012 22:14:52 +0000 (15:14 -0700)]
Merge "Use Mac OS X SDK 10.6."
Ying Wang [Fri, 25 May 2012 22:14:12 +0000 (15:14 -0700)]
Use Mac OS X SDK 10.6.
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
Ying Wang [Tue, 5 Jun 2012 18:36:09 +0000 (11:36 -0700)]
We want to clean *darwin-x86* obj files.
Change-Id: Iec204cfe39cde5434a8d09d8328d315d3c9abfcb
Ying Wang [Tue, 5 Jun 2012 18:20:54 +0000 (11:20 -0700)]
Merge "Use Mac OS X SDK 10.6."
The Android Automerger [Tue, 5 Jun 2012 17:47:19 +0000 (10:47 -0700)]
JRN66B
Jean-Baptiste Queru [Tue, 5 Jun 2012 16:55:14 +0000 (09:55 -0700)]
am
c9f8b8d1: am
90beb4f1: Add some known binary owners
* commit '
c9f8b8d17ea17f722157aa58014dc1f1168996c1':
Add some known binary owners
Jean-Baptiste Queru [Tue, 5 Jun 2012 15:23:19 +0000 (08:23 -0700)]
am
90beb4f1: Add some known binary owners
* commit '
90beb4f155f9e0a7508854ded5b2c3dd87d702f5':
Add some known binary owners
Jean-Baptiste Queru [Tue, 5 Jun 2012 15:08:03 +0000 (08:08 -0700)]
Add some known binary owners
Bug:
6611375
Change-Id: I082128ad15b277ced82c8530c17186842839a557
The Android Automerger [Tue, 5 Jun 2012 14:00:37 +0000 (07:00 -0700)]
JRN66
The Android Automerger [Tue, 5 Jun 2012 13:59:01 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Fri, 25 May 2012 04:05:19 +0000 (21:05 -0700)]
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
The Android Automerger [Mon, 4 Jun 2012 22:36:50 +0000 (15:36 -0700)]
JRN65B
The Android Automerger [Mon, 4 Jun 2012 13:08:33 +0000 (06:08 -0700)]
JRN65
The Android Automerger [Mon, 4 Jun 2012 12:59:24 +0000 (05:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sun, 3 Jun 2012 13:12:07 +0000 (06:12 -0700)]
JRN64
The Android Automerger [Sun, 3 Jun 2012 12:59:39 +0000 (05:59 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Sat, 2 Jun 2012 16:28:34 +0000 (09:28 -0700)]
am
0fb728b6: am
28a18175: Don\'t use .. to reference the target file.
* commit '
0fb728b65ab2199e0273af1217711aa46d6504c6':
Don't use .. to reference the target file.
Ying Wang [Sat, 2 Jun 2012 16:26:47 +0000 (09:26 -0700)]
am
28a18175: Don\'t use .. to reference the target file.
* commit '
28a181759079c34f8776f98f553e56554b527069':
Don't use .. to reference the target file.
Ying Wang [Sat, 2 Jun 2012 16:22:31 +0000 (09:22 -0700)]
Don't use .. to reference the target file.
Change-Id: I1d08db81c37853f5bf0bdf5dbe848634e6ae9f61
Jean-Baptiste Queru [Sat, 2 Jun 2012 15:40:35 +0000 (08:40 -0700)]
am
89a0306e: am
e7af5e24: Add Live Wallpapers to AOSP builds
* commit '
89a0306ec3728bb8def4b78edaa87ba9eadc6d34':
Add Live Wallpapers to AOSP builds
Jean-Baptiste Queru [Sat, 2 Jun 2012 15:35:03 +0000 (08:35 -0700)]
am
e7af5e24: Add Live Wallpapers to AOSP builds
* commit '
e7af5e2428d6c831acb73fac6547c3a780dca729':
Add Live Wallpapers to AOSP builds
Jean-Baptiste Queru [Sat, 2 Jun 2012 01:27:03 +0000 (18:27 -0700)]
Add Live Wallpapers to AOSP builds
Change-Id: I76df14d99fd876b765510ced8f5523e3bafce291
The Android Automerger [Fri, 1 Jun 2012 23:19:57 +0000 (16:19 -0700)]
JFN53N take two
The Android Automerger [Fri, 1 Jun 2012 22:10:10 +0000 (15:10 -0700)]
JFN53N
The Android Automerger [Thu, 31 May 2012 22:54:45 +0000 (15:54 -0700)]
JFN53M
The Android Automerger [Thu, 31 May 2012 21:58:10 +0000 (14:58 -0700)]
JRN61B
Wink Saville [Thu, 31 May 2012 20:27:55 +0000 (13:27 -0700)]
am
84690f96: am
f97105ea: Merge "Fix rild running in Nakasi." into jb-dev
* commit '
84690f969e993ca712d028b9acfb0a7c17c08c44':
Fix rild running in Nakasi.
Wink Saville [Thu, 31 May 2012 20:25:41 +0000 (13:25 -0700)]
am
f97105ea: Merge "Fix rild running in Nakasi." into jb-dev
* commit '
f97105ea898fd4ad83ca55e391c0d512e3497b9b':
Fix rild running in Nakasi.
Wink Saville [Thu, 31 May 2012 20:21:34 +0000 (13:21 -0700)]
Merge "Fix rild running in Nakasi." into jb-dev
Wink Saville [Thu, 31 May 2012 17:35:52 +0000 (10:35 -0700)]
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
The Android Automerger [Thu, 31 May 2012 14:10:16 +0000 (07:10 -0700)]
JRN61
The Android Automerger [Thu, 31 May 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 31 May 2012 07:43:17 +0000 (00:43 -0700)]
JFN53L
The Android Automerger [Thu, 31 May 2012 07:11:46 +0000 (00:11 -0700)]
JFN53K
Keun young Park [Thu, 31 May 2012 03:36:08 +0000 (20:36 -0700)]
am
53ba6b22: am
15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev
* commit '
53ba6b22f94c1192541b11ada001b68823b97efa':
change location of apns-conf.xml and vold.conf
Keun young Park [Thu, 31 May 2012 03:34:00 +0000 (20:34 -0700)]
am
15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev
* commit '
15d151367482b6ed47cecf1a578b365b7c6ccab3':
change location of apns-conf.xml and vold.conf
Keun young Park [Thu, 31 May 2012 03:30:29 +0000 (20:30 -0700)]
Merge "change location of apns-conf.xml and vold.conf" into jb-dev
Ying Wang [Fri, 25 May 2012 22:14:12 +0000 (15:14 -0700)]
Use Mac OS X SDK 10.6.
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
Keun young Park [Wed, 30 May 2012 23:32:30 +0000 (16:32 -0700)]
change location of apns-conf.xml and vold.conf
- from development/data to device/generic/goldfish/data
Change-Id: Iab7ad32b31b64f854412dd3cf23fd244a5306ed9
Keun young Park [Wed, 30 May 2012 23:16:20 +0000 (16:16 -0700)]
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
Keun young Park [Wed, 30 May 2012 23:13:43 +0000 (16:13 -0700)]
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
Keun young Park [Wed, 30 May 2012 23:11:06 +0000 (16:11 -0700)]
Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev
Keun young Park [Wed, 30 May 2012 17:22:29 +0000 (10:22 -0700)]
add add-to-product-copy-files-if-exists for pdk
Change-Id: Ib35006824de81be31652bfff220bbe4e814869ce
The Android Automerger [Wed, 30 May 2012 23:00:12 +0000 (16:00 -0700)]
JRN60B
Jeff Brown [Wed, 30 May 2012 22:05:48 +0000 (15:05 -0700)]
am
0e18fc47: am
01efddb0: Make make make faster.
* commit '
0e18fc47b6181df7d354860095453475c7ecfca0':
Make make make faster.
Jeff Brown [Wed, 30 May 2012 22:02:56 +0000 (15:02 -0700)]
am
01efddb0: Make make make faster.
* commit '
01efddb0b8c641a9ebfd955173dd58e015fbe903':
Make make make faster.
Jeff Brown [Wed, 30 May 2012 20:52:22 +0000 (13:52 -0700)]
Make make make faster.
Optimize common case of uniq-words where the word is not
actually duplicated. Reduces make startup overhead.
Change-Id: I1bee13bbd08a7b01248f4452283a64a724663d02
The Android Open Source Project [Wed, 30 May 2012 17:14:35 +0000 (10:14 -0700)]
am
2e0f19a3: Reconcile with jb-release nakasi-factoryrom-release
* commit '
2e0f19a3fb0de035028717941044ec9e6a36c4a4':
JRN60
JRN59D
JRN59C
JFN53J
JRN59B
The Android Open Source Project [Wed, 30 May 2012 17:12:45 +0000 (10:12 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Iaa4109b5db2d6b15e214c05554b586e5604d9692
The Android Automerger [Wed, 30 May 2012 14:10:33 +0000 (07:10 -0700)]
JRN60
The Android Automerger [Wed, 30 May 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 30 May 2012 04:53:55 +0000 (21:53 -0700)]
JRN59D
The Android Automerger [Wed, 30 May 2012 02:48:47 +0000 (19:48 -0700)]
JRN59C
The Android Automerger [Wed, 30 May 2012 02:45:42 +0000 (19:45 -0700)]
JFN53J
Keun young Park [Wed, 30 May 2012 01:32:33 +0000 (18:32 -0700)]
am
2e64f64c: am
3e93aeae: add platform.zip from platform-java to dist
* commit '
2e64f64c9bc1cc8cbf0f59723b78a278dec66b3b':
add platform.zip from platform-java to dist
Keun young Park [Wed, 30 May 2012 01:28:00 +0000 (18:28 -0700)]
am
3e93aeae: add platform.zip from platform-java to dist
* commit '
3e93aeae10aa70ab64e78fbab0bb8741d0b04d99':
add platform.zip from platform-java to dist
Keun young Park [Wed, 30 May 2012 00:55:46 +0000 (17:55 -0700)]
add platform.zip from platform-java to dist
Change-Id: I08e110edf70ef5ec313ee02e03803fa152f0aa6a
The Android Automerger [Tue, 29 May 2012 22:50:42 +0000 (15:50 -0700)]
JRN59B
Ying Wang [Tue, 29 May 2012 20:47:00 +0000 (13:47 -0700)]
Ying Wang [Tue, 29 May 2012 20:44:13 +0000 (13:44 -0700)]
Ying Wang [Tue, 29 May 2012 20:42:18 +0000 (13:42 -0700)]
Fix typo.
Change-Id: Id4b619e3fff8d801c4662d9cb2719576c370a503