OSDN Git Service
Ying Wang [Tue, 3 Jul 2012 19:16:03 +0000 (12:16 -0700)]
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.
The Android Open Source Project [Tue, 3 Jul 2012 19:11:41 +0000 (12:11 -0700)]
Reconcile with jb-release
Change-Id: Iee367557b16d18b63d71c2ea910d207820643c11
Ying Wang [Tue, 3 Jul 2012 18:30:30 +0000 (11:30 -0700)]
Merge "This property is set when HAVE_SELINUX:=true during build."
William Roberts [Tue, 3 Jul 2012 01:55:14 +0000 (18:55 -0700)]
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
The Android Automerger [Tue, 3 Jul 2012 02:03:14 +0000 (19:03 -0700)]
JRO02C
The Android Automerger [Tue, 3 Jul 2012 01:58:01 +0000 (18:58 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 2 Jul 2012 23:25:03 +0000 (16:25 -0700)]
JRO02B
The Android Automerger [Mon, 2 Jul 2012 23:16:18 +0000 (16:16 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 2 Jul 2012 20:00:27 +0000 (13:00 -0700)]
JRO02
The Android Automerger [Mon, 2 Jul 2012 19:53:12 +0000 (12:53 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Sat, 30 Jun 2012 03:19:50 +0000 (20:19 -0700)]
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
Ying Wang [Sat, 30 Jun 2012 02:55:06 +0000 (19:55 -0700)]
Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
The Android Open Source Project [Sat, 30 Jun 2012 01:28:17 +0000 (18:28 -0700)]
Reconcile with jb-release
Change-Id: I0e57086cc66800b7de474af735ebd7ee896e6a25
The Android Automerger [Fri, 29 Jun 2012 22:57:58 +0000 (15:57 -0700)]
JRN90
The Android Automerger [Fri, 29 Jun 2012 22:47:16 +0000 (15:47 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Fri, 29 Jun 2012 15:13:34 +0000 (08:13 -0700)]
Reconcile with jb-release
Change-Id: I7aaa394cda0be63324f5cba09f93e444fd1763fc
The Android Automerger [Fri, 29 Jun 2012 00:16:17 +0000 (17:16 -0700)]
JRN89B
The Android Automerger [Fri, 29 Jun 2012 00:06:01 +0000 (17:06 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Thu, 28 Jun 2012 23:02:19 +0000 (16:02 -0700)]
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
Scott Main [Thu, 28 Jun 2012 19:01:03 +0000 (12:01 -0700)]
am
f973ced3: docs: better message for download page when os detection fails
* commit '
f973ced37e2d065c0aa41bb5563abad7518bea61':
docs: better message for download page when os detection fails
Scott Main [Thu, 28 Jun 2012 18:56:01 +0000 (11:56 -0700)]
docs: better message for download page when os detection fails
Change-Id: I940c0847ddc214ef36bfd0708d289cff200dfc62
The Android Automerger [Thu, 28 Jun 2012 14:08:48 +0000 (07:08 -0700)]
JRN89
The Android Automerger [Thu, 28 Jun 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 27 Jun 2012 21:15:09 +0000 (14:15 -0700)]
JRN88
The Android Automerger [Wed, 27 Jun 2012 21:04:29 +0000 (14:04 -0700)]
merge in jb-release history after reset to jb-dev
Scott Main [Wed, 27 Jun 2012 09:25:12 +0000 (02:25 -0700)]
am
810e2889: docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it\'s a worthwhile compromise and will investigate a diff solution for that later.
* commit '
810e28891457af6e365b839ac584d77277b2e3fa':
docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it's a worthwhile compromise and will investigate a diff solution for that later.
Scott Main [Wed, 27 Jun 2012 09:08:20 +0000 (02:08 -0700)]
docs: fix overlapping sidebar bug,
but I think this re-introduces a bug in IE where the sidenav
position moves slightly left/right during scroll, but it's a
worthwhile compromise and will investigate a diff solution for that later.
Change-Id: Id1f2141b6638e199d1a4ad1d198a5a5aa45bf264
Scott Main [Wed, 27 Jun 2012 05:26:18 +0000 (22:26 -0700)]
Scott Main [Wed, 27 Jun 2012 05:23:22 +0000 (22:23 -0700)]
docs: misc css
Change-Id: I398d30f9414564f58ea3546a192ad1c12e715349
The Android Automerger [Tue, 26 Jun 2012 18:15:56 +0000 (11:15 -0700)]
JRN87
The Android Automerger [Tue, 26 Jun 2012 18:07:24 +0000 (11:07 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Tue, 26 Jun 2012 14:18:15 +0000 (07:18 -0700)]
Reconcile with jb-release
Change-Id: Iab5346490b6838a2137ffd28e72e4f8d4e9f48da
The Android Automerger [Tue, 26 Jun 2012 00:24:56 +0000 (17:24 -0700)]
JRN84D
The Android Automerger [Tue, 26 Jun 2012 00:14:15 +0000 (17:14 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 26 Jun 2012 00:05:30 +0000 (17:05 -0700)]
JRN84C
The Android Open Source Project [Mon, 25 Jun 2012 19:18:24 +0000 (12:18 -0700)]
Reconcile with jb-release
Change-Id: I2b5cf5780851a3979016a50ff39f7da6d6d1a82b
The Android Automerger [Mon, 25 Jun 2012 18:31:30 +0000 (11:31 -0700)]
JRN84B
The Android Automerger [Mon, 25 Jun 2012 18:29:39 +0000 (11:29 -0700)]
JRN86
The Android Open Source Project [Mon, 25 Jun 2012 14:57:11 +0000 (07:57 -0700)]
Reconcile with jb-release
Change-Id: I80e21c4019904a7f755af426e3e29e41c9b23f78
The Android Automerger [Sun, 24 Jun 2012 06:28:18 +0000 (23:28 -0700)]
JRN84
The Android Automerger [Sun, 24 Jun 2012 06:13:39 +0000 (23:13 -0700)]
merge in jb-release history after reset to jb-dev
Scott Main [Sun, 24 Jun 2012 00:52:58 +0000 (17:52 -0700)]
am
9ada2264: docs: darker font color
* commit '
9ada22647890c18ded2b890d00c0a307bd2bed98':
docs: darker font color
Scott Main [Sat, 23 Jun 2012 21:59:36 +0000 (14:59 -0700)]
docs: darker font color
Change-Id: I8fe4117ac501001dd6c7156b337f3ff7a4f75793
Scott Main [Sat, 23 Jun 2012 18:25:21 +0000 (11:25 -0700)]
am
6a7a66be: docs: try darker text and shorter line height
* commit '
6a7a66beba12d6e655f3dde257a3e4964f8ad0c7':
docs: try darker text and shorter line height
Scott Main [Sat, 23 Jun 2012 18:20:48 +0000 (11:20 -0700)]
docs: try darker text and shorter line height
Change-Id: I7fe3cdc0a0f5cdfd8bcb69b1e1a2d11d8b5301d3
Scott Main [Sat, 23 Jun 2012 12:37:01 +0000 (05:37 -0700)]
am
d786a29f: docs: adjust homepage carousel styles
* commit '
d786a29f14c502986ffc160471daedfd0b5fb5dc':
docs: adjust homepage carousel styles
Scott Main [Sat, 23 Jun 2012 12:37:01 +0000 (05:37 -0700)]
am
25659b02: docs: update sdk template to support new ndk doc layout
* commit '
25659b0217cca1389b2711ee536547b20b266319':
docs: update sdk template to support new ndk doc layout
Scott Main [Sat, 23 Jun 2012 12:36:51 +0000 (05:36 -0700)]
am
412eaf20: docs: style changes for notes
* commit '
412eaf202c63b8d2cc32b5b865ba29155e047697':
docs: style changes for notes
Scott Main [Sat, 23 Jun 2012 04:23:32 +0000 (21:23 -0700)]
docs: adjust homepage carousel styles
Change-Id: Id2b32ce67d26a19b40e7944a5dd37cd17d8eec2a
The Android Automerger [Sat, 23 Jun 2012 03:41:01 +0000 (20:41 -0700)]
JRN83D
The Android Automerger [Sat, 23 Jun 2012 03:37:07 +0000 (20:37 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sat, 23 Jun 2012 01:28:32 +0000 (18:28 -0700)]
JRN83C
The Android Automerger [Sat, 23 Jun 2012 01:19:02 +0000 (18:19 -0700)]
merge in jb-release history after reset to jb-dev
Scott Main [Sat, 23 Jun 2012 00:02:25 +0000 (17:02 -0700)]
docs: update sdk template to support new ndk doc layout
Change-Id: I47ec2fcd4b7116fa3dc59483a434d7f188f984d1
The Android Open Source Project [Fri, 22 Jun 2012 22:20:06 +0000 (15:20 -0700)]
Reconcile with jb-release
Change-Id: I4a8336fb66821c570245f75901919ef6b1b9c641
The Android Automerger [Fri, 22 Jun 2012 22:14:06 +0000 (15:14 -0700)]
JRN83B
The Android Automerger [Fri, 22 Jun 2012 22:03:34 +0000 (15:03 -0700)]
merge in jb-release history after reset to jb-dev
Scott Main [Fri, 22 Jun 2012 21:36:33 +0000 (14:36 -0700)]
docs: style changes for notes
Change-Id: I13bc3f19780421a30feffc6e6ffe19cfadc886e5
Jean-Baptiste Queru [Fri, 22 Jun 2012 21:31:05 +0000 (14:31 -0700)]
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
Jean-Baptiste Queru [Fri, 22 Jun 2012 20:47:19 +0000 (13:47 -0700)]
Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI"
The Android Open Source Project [Fri, 22 Jun 2012 19:37:02 +0000 (12:37 -0700)]
Reconcile with jb-release
Change-Id: I8e514e78efc61e6d7cab247e3c6979a6459bcd55
Scott Main [Fri, 22 Jun 2012 17:31:44 +0000 (10:31 -0700)]
am
f9b799b5: cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df return old analytics script
* commit '
f9b799b5ba0ed5d06c8bf442ddd4319c93fbc95f':
cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df return old analytics script
Scott Main [Fri, 22 Jun 2012 17:25:52 +0000 (10:25 -0700)]
cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df
return old analytics script
Change-Id: Ica4abe000b529272efa9ba7867b3e7aa6c8c9e55
The Android Automerger [Fri, 22 Jun 2012 17:01:55 +0000 (10:01 -0700)]
JRN83
The Android Automerger [Fri, 22 Jun 2012 16:47:02 +0000 (09:47 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Fri, 22 Jun 2012 15:16:45 +0000 (08:16 -0700)]
Reconcile with jb-release
Change-Id: I75d44aea2008be774afc674fda49c2220583080d
Scott Main [Fri, 22 Jun 2012 04:32:44 +0000 (21:32 -0700)]
am
e4d8f1b1: Massive clobber of all template files in developer site for new design
* commit '
e4d8f1b1f5a6e2308bfeff04d7fa51ff7394c644':
Massive clobber of all template files in developer site for new design
Scott Main [Fri, 22 Jun 2012 01:03:05 +0000 (18:03 -0700)]
Massive clobber of all template files in developer site for new design
Change-Id: I5f243dcb377a8b2e573c404a9e685cc64e0e06d2
The Android Automerger [Fri, 22 Jun 2012 00:58:04 +0000 (17:58 -0700)]
JRN82C
The Android Automerger [Fri, 22 Jun 2012 00:47:30 +0000 (17:47 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 21:27:43 +0000 (14:27 -0700)]
JRN82B
The Android Automerger [Thu, 21 Jun 2012 21:16:15 +0000 (14:16 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 14:09:05 +0000 (07:09 -0700)]
JRN82
The Android Automerger [Thu, 21 Jun 2012 13:59:24 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 01:27:28 +0000 (18:27 -0700)]
JRN81C
The Android Automerger [Wed, 20 Jun 2012 22:46:52 +0000 (15:46 -0700)]
JRN81B
The Android Open Source Project [Wed, 20 Jun 2012 15:25:33 +0000 (08:25 -0700)]
Reconcile with jb-release
Change-Id: I71f037e68eda652f71ce7a15e4afff031adbd913
The Android Automerger [Wed, 20 Jun 2012 14:09:13 +0000 (07:09 -0700)]
JRN81
The Android Automerger [Wed, 20 Jun 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 19 Jun 2012 23:30:09 +0000 (16:30 -0700)]
JRN80C
Ying Wang [Tue, 19 Jun 2012 21:27:31 +0000 (14:27 -0700)]
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
Ying Wang [Tue, 19 Jun 2012 21:25:14 +0000 (14:25 -0700)]
Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev
The Android Automerger [Tue, 19 Jun 2012 19:49:07 +0000 (12:49 -0700)]
JRN80B
Jean-Baptiste Queru [Tue, 19 Jun 2012 18:27:26 +0000 (11:27 -0700)]
am
03bb0851: Remove references to packages that don\'t exist any more.
* commit '
03bb0851d6a86ac51becaa132f96ed1d8f4b604c':
Remove references to packages that don't exist any more.
Jean-Baptiste Queru [Tue, 19 Jun 2012 18:17:27 +0000 (11:17 -0700)]
Remove references to packages that don't exist any more.
Those can't be found anywhere in the build system.
Change-Id: I3b3727e7735de0dbffae930cf99a6d6ccbc79570
Ying Wang [Tue, 19 Jun 2012 17:40:37 +0000 (10:40 -0700)]
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
The Android Open Source Project [Tue, 19 Jun 2012 14:15:29 +0000 (07:15 -0700)]
Reconcile with jb-release
Change-Id: Id011e3aaae44e404d9e7b75e5a52f097d2317126
The Android Automerger [Tue, 19 Jun 2012 14:10:41 +0000 (07:10 -0700)]
JRN80
The Android Automerger [Tue, 19 Jun 2012 13:59:24 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Tue, 19 Jun 2012 13:13:10 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: I7cea6b7dd25e75e4b0a738cfa890fcaa556c2d0b
The Android Automerger [Mon, 18 Jun 2012 23:27:50 +0000 (16:27 -0700)]
JRN79C
The Android Automerger [Mon, 18 Jun 2012 22:54:58 +0000 (15:54 -0700)]
JRN79B
Guang Zhu [Mon, 18 Jun 2012 18:55:49 +0000 (11:55 -0700)]
am
5d76a3f2: Merge "add uiautomator into system image" into jb-dev
* commit '
5d76a3f2d53fceb883d84d214c28c51bc3e5b43c':
add uiautomator into system image
Guang Zhu [Mon, 18 Jun 2012 18:52:42 +0000 (11:52 -0700)]
Merge "add uiautomator into system image" into jb-dev
Ying Wang [Mon, 18 Jun 2012 17:33:33 +0000 (10:33 -0700)]
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.
The Android Automerger [Mon, 18 Jun 2012 14:06:59 +0000 (07:06 -0700)]
JRN79
The Android Automerger [Mon, 18 Jun 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 18 Jun 2012 00:06:48 +0000 (17:06 -0700)]
JRN78B
The Android Automerger [Sun, 17 Jun 2012 14:08:19 +0000 (07:08 -0700)]
JRN78
The Android Automerger [Sun, 17 Jun 2012 13:59:26 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
OSDN Git Service
