OSDN Git Service
The Android Open Source Project [Mon, 8 Apr 2013 20:40:29 +0000 (13:40 -0700)]
am
bdd47e50: Reconcile with jb-mr2-release - do not merge
* commit '
bdd47e503cf336cce34ac941c07726377396826d':
"JWR08"
JWR04C
JWR04B
"JWR04"
JWR03B
The Android Open Source Project [Mon, 8 Apr 2013 20:35:34 +0000 (13:35 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ic29dadd7db4775b7812868535dd2c510a64f0591
The Android Automerger [Mon, 8 Apr 2013 12:58:37 +0000 (05:58 -0700)]
"JWR08"
The Android Automerger [Mon, 8 Apr 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Sat, 6 Apr 2013 04:10:47 +0000 (21:10 -0700)]
am
8537b614: am
4996c807: Merge "Fix the win_sdk build."
* commit '
8537b6145ad275d6fb40e5be4286ff43eaace868':
Fix the win_sdk build.
Ying Wang [Sat, 6 Apr 2013 04:07:24 +0000 (21:07 -0700)]
am
e63604e3: resolved conflicts for merge of
2321482e to jb-mr2-dev-plus-aosp
* commit '
e63604e3a8b6114067bb1604797a04ae84ca7cc5':
Switch to prebuilt bison
Ying Wang [Sat, 6 Apr 2013 04:06:19 +0000 (21:06 -0700)]
am
4996c807: Merge "Fix the win_sdk build."
* commit '
4996c8073e87dd9e361b385d8aeb121f4c36a221':
Fix the win_sdk build.
Ying Wang [Sat, 6 Apr 2013 04:04:23 +0000 (21:04 -0700)]
resolved conflicts for merge of
2321482e to jb-mr2-dev-plus-aosp
Change-Id: I1b144cdf6774df95c0507cc5751d7def240cf645
Ying Wang [Sat, 6 Apr 2013 02:51:24 +0000 (02:51 +0000)]
Merge "Fix the win_sdk build."
Ying Wang [Sat, 6 Apr 2013 02:51:05 +0000 (02:51 +0000)]
Merge "Switch to prebuilt bison"
Ying Wang [Sat, 6 Apr 2013 01:51:32 +0000 (18:51 -0700)]
Fix the win_sdk build.
Change-Id: Ia6a300dcee084d79960aba4fba552dd7fd9c2dee
Ying Wang [Sat, 6 Apr 2013 02:00:00 +0000 (19:00 -0700)]
am
31e588e4: am
dd75a03d: Fix the win_sdk build.
* commit '
31e588e4e1f7fa4223d01999150c7e2a71c797ac':
Fix the win_sdk build.
Ying Wang [Sat, 6 Apr 2013 01:57:06 +0000 (18:57 -0700)]
am
dd75a03d: Fix the win_sdk build.
* commit '
dd75a03d35499c34db913e886dbed5c37f5ce6d8':
Fix the win_sdk build.
Ying Wang [Sat, 6 Apr 2013 01:51:32 +0000 (18:51 -0700)]
Fix the win_sdk build.
Change-Id: Ia6a300dcee084d79960aba4fba552dd7fd9c2dee
Ying Wang [Sat, 6 Apr 2013 01:02:16 +0000 (18:02 -0700)]
Switch to prebuilt bison
Bug:
8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
Ying Wang [Sat, 6 Apr 2013 01:29:16 +0000 (18:29 -0700)]
am
adf3e7fb: am
854be683: Switch to prebuilt bison
* commit '
adf3e7fb301eaddecdd949f83a3e4cf288635879':
Switch to prebuilt bison
Ying Wang [Sat, 6 Apr 2013 01:25:57 +0000 (18:25 -0700)]
am
854be683: Switch to prebuilt bison
* commit '
854be683636892eed455100d0c20b0f7dd8c5076':
Switch to prebuilt bison
Ying Wang [Sat, 6 Apr 2013 01:02:16 +0000 (18:02 -0700)]
Switch to prebuilt bison
Bug:
8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
The Android Automerger [Fri, 5 Apr 2013 22:14:45 +0000 (15:14 -0700)]
JWR04C
The Android Automerger [Thu, 4 Apr 2013 23:25:30 +0000 (16:25 -0700)]
JWR04B
The Android Automerger [Thu, 4 Apr 2013 12:57:18 +0000 (05:57 -0700)]
"JWR04"
The Android Automerger [Thu, 4 Apr 2013 12:55:10 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Thu, 4 Apr 2013 01:05:25 +0000 (18:05 -0700)]
am
d503fa85: Reconcile with jb-mr2-release - do not merge
* commit '
d503fa85deaf4c14d27f45c1408ed13f302f36f4':
"JWR03"
JWR02B
"JWR02"
The Android Automerger [Thu, 4 Apr 2013 00:02:56 +0000 (17:02 -0700)]
JWR03B
The Android Open Source Project [Wed, 3 Apr 2013 23:43:07 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If59d4eea208050457ffe142edea2aa28385e3aa3
Brian Carlstrom [Wed, 3 Apr 2013 22:03:48 +0000 (15:03 -0700)]
am
71267677: resolved conflicts for merge of
5ec66d15 to jb-mr2-dev-plus-aosp
* commit '
712676772b0d6e32bdce3430eed0a4d9771aac7e':
Add OkHttp to the platform.
Brian Carlstrom [Wed, 3 Apr 2013 21:19:26 +0000 (14:19 -0700)]
resolved conflicts for merge of
5ec66d15 to jb-mr2-dev-plus-aosp
Change-Id: I0ef1665600f78527d0a98c7b36c4c2ef1a8182e3
Robert Ly [Wed, 3 Apr 2013 21:12:33 +0000 (14:12 -0700)]
am
fe15b4da: am
ca957508: am
f3840a2c: am
99532a5a: am
ad027032: am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
fe15b4dad3538fbcbdea3a09243a5f25d3718b3e':
fix android build number in footer of gms and gcm reference
Ulas Kirazci [Wed, 3 Apr 2013 21:12:24 +0000 (14:12 -0700)]
am
24242c60: am
bde274ef: Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
* commit '
24242c60fbec32762608f6eecb91ba5a7d56d86d':
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Robert Ly [Wed, 3 Apr 2013 21:06:51 +0000 (14:06 -0700)]
am
ca957508: am
f3840a2c: am
99532a5a: am
ad027032: am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
ca957508015e841d5a6a4e582d73c6d779419561':
fix android build number in footer of gms and gcm reference
Ulas Kirazci [Wed, 3 Apr 2013 21:03:22 +0000 (14:03 -0700)]
am
bde274ef: Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
* commit '
bde274ef83b9e22365205a7cd320e13bc53ae625':
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Robert Ly [Wed, 3 Apr 2013 21:01:54 +0000 (14:01 -0700)]
am
f3840a2c: am
99532a5a: am
ad027032: am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
f3840a2c2c614a271c8678fb65fc4a6148f41744':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:58:38 +0000 (13:58 -0700)]
am
99532a5a: am
ad027032: am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
99532a5aeabe3d55fa99407e948782a6dcf15e5e':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:56:04 +0000 (13:56 -0700)]
am
ad027032: am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
ad027032b11f592cc58286f535e087053b0220f0':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:54:00 +0000 (13:54 -0700)]
am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
e046ede5350affd49268d35692b5142d1471381d':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:52:06 +0000 (13:52 -0700)]
am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
3eba74ffc1f2a542a0d0376215fb6d2711e7639c':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:48:35 +0000 (13:48 -0700)]
am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
ddde20b67c521fbd7ad090f7a1e4ab3f69865b4f':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:38:55 +0000 (20:38 +0000)]
Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
Ulas Kirazci [Thu, 28 Mar 2013 21:02:14 +0000 (14:02 -0700)]
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
Ying Wang [Wed, 3 Apr 2013 19:31:24 +0000 (19:31 +0000)]
Merge "Add OkHttp to the platform."
The Android Automerger [Wed, 3 Apr 2013 13:03:57 +0000 (06:03 -0700)]
"JWR03"
The Android Automerger [Wed, 3 Apr 2013 13:02:06 +0000 (06:02 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 2 Apr 2013 23:55:26 +0000 (16:55 -0700)]
JWR02B
jwilson [Sat, 30 Mar 2013 13:00:01 +0000 (09:00 -0400)]
Add OkHttp to the platform.
Change-Id: I18716683632249573295cb2eb5229a1188ed0f17
Scott Main [Tue, 2 Apr 2013 21:21:11 +0000 (14:21 -0700)]
am
758a22b5: am
248a9dd4: am
baa0023b: am
2e5602cd: am
70174c67: am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as a
* commit '
758a22b503dabc6ca8761afa97bed7f6a5c60db7':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:59:08 +0000 (13:59 -0700)]
am
248a9dd4: am
baa0023b: am
2e5602cd: am
70174c67: am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms
* commit '
248a9dd4c91a4ca9d2410b976eab79521b97d0df':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:55:59 +0000 (13:55 -0700)]
am
baa0023b: am
2e5602cd: am
70174c67: am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is
* commit '
baa0023b9f1e5cbc3cfa0c39ea5893cd68d5a981':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:51:52 +0000 (13:51 -0700)]
am
2e5602cd: am
70174c67: am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into n
* commit '
2e5602cd6251d7669f5adc9ccda3a5451a0195bd':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:47:47 +0000 (13:47 -0700)]
am
70174c67: am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
* commit '
70174c6783f85d105157f2b2207a3d459e966237':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:44:22 +0000 (13:44 -0700)]
am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
* commit '
07e13f7c25d22ac30a59b10feebf92a3d2df6e02':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:40:05 +0000 (13:40 -0700)]
am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
* commit '
f614554daed6b8fe1ff646136a28c8090474b39e':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Ben Murdoch [Tue, 2 Apr 2013 18:04:34 +0000 (11:04 -0700)]
The Android Open Source Project [Tue, 2 Apr 2013 18:04:12 +0000 (11:04 -0700)]
am
f518b598: Reconcile with jb-mr2-release - do not merge
* commit '
f518b5982edc0fa8fb916f38e52ce54c56d6a11d':
JWR01B
JWR01
JWQ87E
JWQ87D
Jeff Brown [Tue, 2 Apr 2013 18:03:40 +0000 (11:03 -0700)]
am
b528116b: am
dd243370: apicheck: Suppress certain changes in final qualifier.
* commit '
b528116bba0e690f620ee2a150560ce8217490de':
apicheck: Suppress certain changes in final qualifier.
Ben Murdoch [Tue, 2 Apr 2013 17:28:21 +0000 (10:28 -0700)]
Ben Murdoch [Tue, 2 Apr 2013 17:20:10 +0000 (18:20 +0100)]
Fix SDK build.
Ensure that we include the Chromium-WebView resources.
Change-Id: I3f7b4e52ebb59fa6a8952839bb071c7994505b75
The Android Automerger [Tue, 2 Apr 2013 16:19:59 +0000 (09:19 -0700)]
"JWR02"
The Android Automerger [Tue, 2 Apr 2013 16:18:12 +0000 (09:18 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Tue, 2 Apr 2013 15:39:21 +0000 (08:39 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I60878364265a0889aaa0d1f32e709b9a4e632636
Jeff Brown [Tue, 2 Apr 2013 15:24:12 +0000 (08:24 -0700)]
am
dd243370: apicheck: Suppress certain changes in final qualifier.
* commit '
dd243370f509115a9e3bd263dcf31e74ae448bd5':
apicheck: Suppress certain changes in final qualifier.
Wink Saville [Tue, 2 Apr 2013 01:04:14 +0000 (18:04 -0700)]
am
061604bd: am
0262d0f7: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
* commit '
061604bdadd797a5371248c177e77c942c2c44f6':
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Wink Saville [Tue, 2 Apr 2013 01:02:06 +0000 (18:02 -0700)]
am
0262d0f7: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
* commit '
0262d0f74725f8a165b20eeac323cdd8ca31df03':
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Wink Saville [Tue, 2 Apr 2013 00:43:38 +0000 (00:43 +0000)]
Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
Scott Main [Mon, 1 Apr 2013 23:38:11 +0000 (16:38 -0700)]
load google API navtree ondemand (remove request from <head>).
Also move the code for highlighting the sidenav into a separate method
that we can call at a later time, such as after the gms reference is loaded into nav.
Change-Id: I924d68b2b9dbfed83f81d1fd418e06b6c79a9010
The Android Automerger [Mon, 1 Apr 2013 23:29:47 +0000 (16:29 -0700)]
JWR01B
Jeff Brown [Mon, 1 Apr 2013 20:40:55 +0000 (13:40 -0700)]
apicheck: Suppress certain changes in final qualifier.
It is safe for a class to become final if it was not previously
instantiable since applications could not declare subclasses
of their own.
Likewise it is always safe to remove final.
Change-Id: I9a72fee7b25ccceca2024112812b97872ba2ec6b
Ying Wang [Mon, 1 Apr 2013 19:06:02 +0000 (12:06 -0700)]
am
6686497b: am
51f7dcb9: Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev
* commit '
6686497ba38eec4b1ec62fc40b25b111a3653643':
Default install path of shared Java library with tag tests
Ying Wang [Mon, 1 Apr 2013 19:03:46 +0000 (12:03 -0700)]
am
51f7dcb9: Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev
* commit '
51f7dcb9adb60c91bf85d3148c841efa2b3a14f2':
Default install path of shared Java library with tag tests
Ying Wang [Mon, 1 Apr 2013 19:00:13 +0000 (19:00 +0000)]
Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev
The Android Automerger [Mon, 1 Apr 2013 12:57:34 +0000 (05:57 -0700)]
JWR01
The Android Automerger [Mon, 1 Apr 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Sat, 30 Mar 2013 02:19:49 +0000 (19:19 -0700)]
am
0f7e0694: am
a1fd8e44: Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools"
* commit '
0f7e0694a575fa4472f43e6a4e11c053ff99d69b':
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
Ying Wang [Sat, 30 Mar 2013 02:18:38 +0000 (19:18 -0700)]
am
a1fd8e44: Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools"
* commit '
a1fd8e44b71a83f2733258b020c4057af3c4046a':
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
Ying Wang [Sat, 30 Mar 2013 01:20:27 +0000 (01:20 +0000)]
Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools"
Ying Wang [Sat, 30 Mar 2013 00:40:14 +0000 (17:40 -0700)]
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
Change-Id: Ia3647674f294c42e9fbe2163bf0d70012313bb15
The Android Automerger [Fri, 29 Mar 2013 23:18:48 +0000 (16:18 -0700)]
JWQ87E
Raph Levien [Fri, 29 Mar 2013 21:35:15 +0000 (14:35 -0700)]
am
a1eb76ae: am
59fa08bd: Merge "Switch Indic fonts to Noto" into jb-mr2-dev
* commit '
a1eb76aeb6d3df64b960ad47b60f408765c52069':
Switch Indic fonts to Noto
The Android Automerger [Fri, 29 Mar 2013 21:03:26 +0000 (14:03 -0700)]
JWQ87D
Raph Levien [Fri, 29 Mar 2013 17:44:17 +0000 (10:44 -0700)]
am
59fa08bd: Merge "Switch Indic fonts to Noto" into jb-mr2-dev
* commit '
59fa08bd3c624be9ea06789b70c22b483df612c4':
Switch Indic fonts to Noto
Raph Levien [Fri, 29 Mar 2013 17:43:08 +0000 (17:43 +0000)]
Merge "Switch Indic fonts to Noto" into jb-mr2-dev
Raph Levien [Fri, 29 Mar 2013 17:22:31 +0000 (10:22 -0700)]
Switch Indic fonts to Noto
This patch changes the fonts actually installed on the device from
the older cibu and lohit fonts to the new noto ones. Note that the
decision of whether to include the fonts based on device profile
is in the fonts.mk of the individual font projects.
Change-Id: I8b9dced0cf5bef3f8a011f925c263c346f49e407
The Android Open Source Project [Fri, 29 Mar 2013 16:50:35 +0000 (09:50 -0700)]
am
d28e10d6: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
d28e10d6c183a1e6e2f7be1001188d635c730f87':
JWQ87C
JWQ87B
JWQ87
JWQ86C
JWQ86B
JWQ86
The Android Open Source Project [Fri, 29 Mar 2013 16:48:35 +0000 (09:48 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I88a69e508f1bd76db6289d1956f0861701a30391
Benoit Goby [Fri, 29 Mar 2013 03:13:42 +0000 (03:13 +0000)]
Merge "Add reboot to build"
The Android Automerger [Fri, 29 Mar 2013 00:28:35 +0000 (17:28 -0700)]
JWQ87C
keunyoung [Fri, 29 Mar 2013 00:15:40 +0000 (17:15 -0700)]
am
aa0d1a17: am
6f79520b: Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev
* commit '
aa0d1a173787bdc766a0fa48052c0cf796f91602':
find pdk platform.zip from full_ directory as well for aosp_ products
keunyoung [Fri, 29 Mar 2013 00:12:54 +0000 (17:12 -0700)]
am
6f79520b: Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev
* commit '
6f79520bf77840f260b02143a556e4004e384732':
find pdk platform.zip from full_ directory as well for aosp_ products
keunyoung [Fri, 29 Mar 2013 00:11:22 +0000 (00:11 +0000)]
Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev
Devin Kim [Thu, 28 Mar 2013 23:43:56 +0000 (16:43 -0700)]
am
e8ca0a6f: am
60b9efc0: Do not disable factory build under PDK
* commit '
e8ca0a6f06a480322c40bd13e605885248b1ef1a':
Do not disable factory build under PDK
Devin Kim [Thu, 28 Mar 2013 23:42:42 +0000 (16:42 -0700)]
am
60b9efc0: Do not disable factory build under PDK
* commit '
60b9efc060162a9ce0c8bc2ca3b9139c498eb50c':
Do not disable factory build under PDK
Ulas Kirazci [Thu, 28 Mar 2013 21:02:14 +0000 (14:02 -0700)]
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
The Android Automerger [Thu, 28 Mar 2013 22:46:28 +0000 (15:46 -0700)]
JWQ87B
keunyoung [Thu, 28 Mar 2013 21:08:31 +0000 (14:08 -0700)]
find pdk platform.zip from full_ directory as well for aosp_ products
Change-Id: I85f8c26e055958b6fa93c375f1080e297795a417
Devin Kim [Mon, 4 Feb 2013 20:24:44 +0000 (12:24 -0800)]
Do not disable factory build under PDK
This is related to commit a1712e.
Some PDKs need the factory build under PDK. If you want to disable the factory
build under PDK, use TARGET_NO_FACTORY in your device's BoardConfig.mk
Change-Id: I5e208836918ffd737951d3fb1f54c560d2b93641
The Android Automerger [Thu, 28 Mar 2013 12:57:57 +0000 (05:57 -0700)]
JWQ87
The Android Automerger [Thu, 28 Mar 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Brian Carlstrom [Thu, 28 Mar 2013 00:16:48 +0000 (17:16 -0700)]
am
fd642ed5: am
d76ff19a: Merge "resolved conflicts for merge of
9a3b17d1 to jb-mr2-dev" into jb-mr2-dev
* commit '
fd642ed55349dbb482f27f339e2a3509e05fdf25':
Added local variable info output to javac command for host build.
Stephen Hines [Thu, 28 Mar 2013 00:16:47 +0000 (17:16 -0700)]
am
92b82aa2: am
ffbeac3f: Merge "Link RS compatibility files with libc and make bcc_compat a regular dep." into jb-mr2-dev
* commit '
92b82aa2eeb9f3867e2d381e8324da4ebc35658e':
Link RS compatibility files with libc and make bcc_compat a regular dep.
Brian Carlstrom [Thu, 28 Mar 2013 00:14:47 +0000 (17:14 -0700)]
am
d76ff19a: Merge "resolved conflicts for merge of
9a3b17d1 to jb-mr2-dev" into jb-mr2-dev
* commit '
d76ff19a0f358d1b6473c33157c5ace2128d9623':
Added local variable info output to javac command for host build.
Stephen Hines [Thu, 28 Mar 2013 00:14:43 +0000 (17:14 -0700)]
am
ffbeac3f: Merge "Link RS compatibility files with libc and make bcc_compat a regular dep." into jb-mr2-dev
* commit '
ffbeac3f47d192e96c901189a3f5bd2fd4407a97':
Link RS compatibility files with libc and make bcc_compat a regular dep.
OSDN Git Service
