OSDN Git Service

android-x86/build.git
11 years agoRevert "Get rid of the liblog hack."
Ying Wang [Wed, 10 Apr 2013 22:11:43 +0000 (22:11 +0000)]
Revert "Get rid of the liblog hack."

This reverts commit 7636578729ffcd02bfb5158db884f559a52d8905

Change-Id: I32f2acce5f99cb97eae986dfeba6d5d25378aefa

11 years agoGet rid of the liblog hack.
Ying Wang [Wed, 10 Apr 2013 06:27:57 +0000 (23:27 -0700)]
Get rid of the liblog hack.

Bug: 8580410
Change-Id: I4b437d10522ee66c7883faacfaf7e30abede394c

11 years agoAdd liblog
Ying Wang [Wed, 10 Apr 2013 05:33:58 +0000 (22:33 -0700)]
Add liblog

Bug: 8580410
Change-Id: Id3c26ff084950f8cbfa87f4425747ee322de7624

11 years agoMerge "Revert "Add liblog"" into jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 05:32:37 +0000 (05:32 +0000)]
Merge "Revert "Add liblog"" into jb-mr2-dev

11 years agoRevert "Add liblog"
Ying Wang [Wed, 10 Apr 2013 05:32:21 +0000 (05:32 +0000)]
Revert "Add liblog"

This reverts commit 8722580d90840352883a84d1ca882e50220f3959

Change-Id: Iafdbb7f540a53ddc9dc2e21c0afddb62c44c4af8

11 years agoMerge "Add liblog" into jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 05:12:00 +0000 (05:12 +0000)]
Merge "Add liblog" into jb-mr2-dev

11 years agoAdd liblog
Ying Wang [Wed, 10 Apr 2013 04:41:48 +0000 (21:41 -0700)]
Add liblog

Bug: 8580410
Change-Id: I45e17b786b8d221a071b5de2432bb1367e245fb4

11 years agoam 645c6887: am 7b0422e5: am 969c4c0c: am b6b3da3c: am a4d2d0ef: s.a.c templates
Robert Ly [Tue, 9 Apr 2013 20:43:50 +0000 (13:43 -0700)]
am 645c6887: am 7b0422e5: am 969c4c0c: am b6b3da3c: am a4d2d0ef: s.a.c templates

* commit '645c6887287c78590eabd8c8f2d7486bfda32544':
  s.a.c templates

11 years agoam 7b0422e5: am 969c4c0c: am b6b3da3c: am a4d2d0ef: s.a.c templates
Robert Ly [Tue, 9 Apr 2013 20:40:36 +0000 (13:40 -0700)]
am 7b0422e5: am 969c4c0c: am b6b3da3c: am a4d2d0ef: s.a.c templates

* commit '7b0422e5ba911b8864ed89e76698f9d332732d77':
  s.a.c templates

11 years agoam 969c4c0c: am b6b3da3c: am a4d2d0ef: s.a.c templates
Robert Ly [Tue, 9 Apr 2013 20:37:01 +0000 (13:37 -0700)]
am 969c4c0c: am b6b3da3c: am a4d2d0ef: s.a.c templates

* commit '969c4c0c3c0d24d00bb27606de477f4c0cfc24fc':
  s.a.c templates

11 years agoam b6b3da3c: am a4d2d0ef: s.a.c templates
Robert Ly [Tue, 9 Apr 2013 20:33:28 +0000 (13:33 -0700)]
am b6b3da3c: am a4d2d0ef: s.a.c templates

* commit 'b6b3da3c9a095167b0257903234960aac9e80ebb':
  s.a.c templates

11 years agoam a4d2d0ef: s.a.c templates
Robert Ly [Tue, 9 Apr 2013 20:29:57 +0000 (13:29 -0700)]
am a4d2d0ef: s.a.c templates

* commit 'a4d2d0ef551f443445a1dffb05f530de32b01fb3':
  s.a.c templates

11 years agos.a.c templates
Robert Ly [Tue, 9 Apr 2013 18:26:12 +0000 (11:26 -0700)]
s.a.c templates

Change-Id: Ia6554ba55d10af10227cde336026b51a27307aa0

11 years agoMerge "Add new media command to build." into jb-mr2-dev
Dianne Hackborn [Mon, 8 Apr 2013 22:35:34 +0000 (22:35 +0000)]
Merge "Add new media command to build." into jb-mr2-dev

11 years agoFix 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

11 years agoSwitch 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

11 years agoAdd new media command to build.
Dianne Hackborn [Fri, 5 Apr 2013 01:50:45 +0000 (18:50 -0700)]
Add new media command to build.

Change-Id: I3c32924b0c6400aa22221646f8e118a66f65f628

11 years agoam f3840a2c: am 99532a5a: am ad027032: am e046ede5: am 3eba74ff: am ddde20b6: Merge...
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

11 years agoam 99532a5a: am ad027032: am e046ede5: am 3eba74ff: am ddde20b6: Merge "fix android...
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

11 years agoam ad027032: am e046ede5: am 3eba74ff: am ddde20b6: Merge "fix android build number...
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

11 years agoam e046ede5: am 3eba74ff: am ddde20b6: Merge "fix android build number in footer...
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

11 years agoam 3eba74ff: am ddde20b6: Merge "fix android build number in footer of gms and gcm...
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

11 years agoam ddde20b6: Merge "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

11 years agoMerge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
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

11 years agoAdd a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
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

11 years agoam baa0023b: am 2e5602cd: am 70174c67: am 07e13f7c: am f614554d: load google API...
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.

11 years agoam 2e5602cd: am 70174c67: am 07e13f7c: am f614554d: load google API navtree ondemand...
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.

11 years agoam 70174c67: am 07e13f7c: am f614554d: load google API navtree ondemand (remove reque...
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.

11 years agoam 07e13f7c: am f614554d: load google API navtree ondemand (remove request from ...
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.

11 years agoam f614554d: load google API navtree ondemand (remove request from <head>). Also...
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.

11 years agoFix SDK build.
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

11 years agoload google API navtree ondemand (remove request from <head>).
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

11 years agoapicheck: Suppress certain changes in final qualifier.
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

11 years agoMerge "Default install path of shared Java library with tag tests" into jb-mr2-dev
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

11 years agoMerge "Switch Indic fonts to Noto" into jb-mr2-dev
Raph Levien [Fri, 29 Mar 2013 17:43:08 +0000 (17:43 +0000)]
Merge "Switch Indic fonts to Noto" into jb-mr2-dev

11 years agoSwitch Indic fonts to Noto
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

11 years agoMerge "find pdk platform.zip from full_ directory as well for aosp_ products" into...
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

11 years agofind pdk platform.zip from full_ directory as well for aosp_ products
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

11 years agoDo not disable factory build under PDK
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

11 years agoMerge "resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev" into jb-mr2-dev
Brian Carlstrom [Thu, 28 Mar 2013 00:11:20 +0000 (00:11 +0000)]
Merge "resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev" into jb-mr2-dev

11 years agoresolved conflicts for merge of 9a3b17d1 to jb-mr2-dev
Brian Carlstrom [Thu, 28 Mar 2013 00:04:05 +0000 (17:04 -0700)]
resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev

Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6

11 years agoMerge "Link RS compatibility files with libc and make bcc_compat a regular dep."...
Stephen Hines [Wed, 27 Mar 2013 23:59:29 +0000 (23:59 +0000)]
Merge "Link RS compatibility files with libc and make bcc_compat a regular dep." into jb-mr2-dev

11 years agoLink RS compatibility files with libc and make bcc_compat a regular dep.
Stephen Hines [Wed, 27 Mar 2013 23:51:38 +0000 (16:51 -0700)]
Link RS compatibility files with libc and make bcc_compat a regular dep.

If we don't do "-lc", we end up missing symbols like "memset" on our non-NEON
builds. It also makes more sense to have bcc_compat as a standard dependency
for now, since it occasionally changes the way we compile/link our source
files.

Change-Id: I4b0ead66caa7c72fb7733db8804a33faa5350930

11 years agoam 923ac1a8: Merge "Added local variable info output to javac command for host build."
Brian Carlstrom [Wed, 27 Mar 2013 23:40:25 +0000 (16:40 -0700)]
am 923ac1a8: Merge "Added local variable info output to javac command for host build."

* commit '923ac1a8717f38f116708c259b8d75bc303abd5a':
  Added local variable info output to javac command for host build.

11 years agoam 6c3f41ac: am a6188a56: am 972c3798: am 28ca0f32: am 25e7300c: load the navtree...
Scott Main [Wed, 27 Mar 2013 23:12:22 +0000 (16:12 -0700)]
am 6c3f41ac: am a6188a56: am 972c3798: am 28ca0f32: am 25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded

* commit '6c3f41ac7cf51c0a3405296853b075f929e07397':
  load the navtree javascript on demand; don't try setting up the tree until it's loaded

11 years agoam a6188a56: am 972c3798: am 28ca0f32: am 25e7300c: load the navtree javascript on...
Scott Main [Wed, 27 Mar 2013 23:10:10 +0000 (16:10 -0700)]
am a6188a56: am 972c3798: am 28ca0f32: am 25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded

* commit 'a6188a56ea8f10a3ce81fb95fbf508cae688c4b1':
  load the navtree javascript on demand; don't try setting up the tree until it's loaded

11 years agoam 972c3798: am 28ca0f32: am 25e7300c: load the navtree javascript on demand; don...
Scott Main [Wed, 27 Mar 2013 23:07:57 +0000 (16:07 -0700)]
am 972c3798: am 28ca0f32: am 25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded

* commit '972c3798890f8b0e20005eece62ee88f508dd761':
  load the navtree javascript on demand; don't try setting up the tree until it's loaded

11 years agoam 28ca0f32: am 25e7300c: load the navtree javascript on demand; don\'t try setting...
Scott Main [Wed, 27 Mar 2013 23:05:56 +0000 (16:05 -0700)]
am 28ca0f32: am 25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded

* commit '28ca0f324454faa3c6d40331ecb3abb1c1a13d74':
  load the navtree javascript on demand; don't try setting up the tree until it's loaded

11 years agoam 25e7300c: load the navtree javascript on demand; don\'t try setting up the tree...
Scott Main [Wed, 27 Mar 2013 23:03:55 +0000 (16:03 -0700)]
am 25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded

* commit '25e7300c2499d0ecaad91aecc3fbf988c59fc7da':
  load the navtree javascript on demand; don't try setting up the tree until it's loaded

11 years agoload the navtree javascript on demand; don't try setting up the tree until it's loaded
Scott Main [Wed, 27 Mar 2013 22:24:06 +0000 (15:24 -0700)]
load the navtree javascript on demand; don't try setting up the tree until it's loaded

Change-Id: I1f209869a17099dd853a2f4cae766481a6cd03eb

11 years agoMerge "Added local variable info output to javac command for host build."
Brian Carlstrom [Wed, 27 Mar 2013 22:44:30 +0000 (22:44 +0000)]
Merge "Added local variable info output to javac command for host build."

11 years agoAdded local variable info output to javac command for host build.
jeffhao [Tue, 17 Apr 2012 23:24:33 +0000 (16:24 -0700)]
Added local variable info output to javac command for host build.

The host java files weren't being compiled with -g.

(cherry-picked from 3a971f734060d19fc023ccf82e39d956a31b7cfb)

Change-Id: I4274910c64ebf52ec955e30e800b34fc309db27b

11 years agoMerge commit 'e8c9e82d' into manualmerge
repo sync [Wed, 27 Mar 2013 00:21:01 +0000 (17:21 -0700)]
Merge commit 'e8c9e82d' into manualmerge

Change-Id: Iaf02a0ab32918064248410aab95facac6a2b9675

11 years agoam 50585e76: Merge "Add sepolicy and mac_perms to installclean"
Geremy Condra [Tue, 26 Mar 2013 23:39:22 +0000 (16:39 -0700)]
am 50585e76: Merge "Add sepolicy and mac_perms to installclean"

* commit '50585e76fd13eb3d91f8d9e9e7ae5e1a3cd1ae86':
  Add sepolicy and mac_perms to installclean

11 years agoDefault install path of shared Java library with tag tests
Ying Wang [Tue, 26 Mar 2013 23:01:02 +0000 (16:01 -0700)]
Default install path of shared Java library with tag tests

To $(PRODUCT_OUT)/data/framework/.

Change-Id: Iff6bbada47258344c13853d4fd71c7ad4b709c2c

11 years agoMerge "Add sepolicy and mac_perms to installclean"
Geremy Condra [Tue, 26 Mar 2013 22:35:50 +0000 (22:35 +0000)]
Merge "Add sepolicy and mac_perms to installclean"

11 years agoAdd sepolicy and mac_perms to installclean
William Roberts [Tue, 26 Mar 2013 21:51:18 +0000 (14:51 -0700)]
Add sepolicy and mac_perms to installclean

Remove the output files for SELinux policy
and mac_permissions.xml mapping for changes
between user and eng build.

Change-Id: Ie27dcedde0c22ce917d90466a763698c86919530

11 years agoFix build - Add missing backslash
Jean-Baptiste Queru [Tue, 26 Mar 2013 21:21:33 +0000 (14:21 -0700)]
Fix build - Add missing backslash

Change-Id: Ic27b8cf0d144bb32fc757f4a01141bba3280307b

11 years agoRename AOSP builds to aosp_*
Jean-Baptiste Queru [Fri, 22 Mar 2013 22:53:54 +0000 (15:53 -0700)]
Rename AOSP builds to aosp_*

Change-Id: If609f66904ac560bc7a6e9ff9a43c2e039525687

11 years agoAllow to run Proguard on static Java library
Ying Wang [Tue, 26 Mar 2013 19:42:32 +0000 (12:42 -0700)]
Allow to run Proguard on static Java library

1. Let aapt output the proguard_options file
2. If proguard is enabled, switch the dependency from
$(full_classes_jar) to $(full_classes_proguard_jar).

Change-Id: Idc641a1515b8899a4623a2aeec5cd494f6c1c1c5

11 years agoam 545c8eed: (-s ours) Reconcile with jb-mr1.1-release - do not merge
The Android Open Source Project [Tue, 26 Mar 2013 17:54:40 +0000 (10:54 -0700)]
am 545c8eed: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '545c8eed678101a836972c5f68941078f7fb0863':
  JDQ39E
  JDQ39D
  JDQ39C

11 years agoReconcile with jb-mr1.1-release - do not merge
The Android Open Source Project [Tue, 26 Mar 2013 17:53:09 +0000 (10:53 -0700)]
Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ia0536d6a75f255879a24145def55c44c93050aaa

11 years agoam 964c6321: am 709fcf04: am 2325250e: am 9ae6d37a: am de295276: add javascript actio...
Scott Main [Tue, 26 Mar 2013 01:19:46 +0000 (18:19 -0700)]
am 964c6321: am 709fcf04: am 2325250e: am 9ae6d37a: am de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google

* commit '964c6321ae015522c9f7e26d47189890b636a592':
  add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google

11 years agoam 709fcf04: am 2325250e: am 9ae6d37a: am de295276: add javascript action events...
Scott Main [Mon, 25 Mar 2013 23:17:42 +0000 (16:17 -0700)]
am 709fcf04: am 2325250e: am 9ae6d37a: am de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google

* commit '709fcf04a0294544658166a10021978870d756ef':
  add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google

11 years agoam 2325250e: am 9ae6d37a: am de295276: add javascript action events to search suggest...
Scott Main [Mon, 25 Mar 2013 23:15:12 +0000 (16:15 -0700)]
am 2325250e: am 9ae6d37a: am de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google

* commit '2325250e639f3c443a8ccd006f0d591eb8f1c5d3':
  add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google

11 years agoam 9ae6d37a: am de295276: add javascript action events to search suggestions and...
Scott Main [Mon, 25 Mar 2013 23:13:29 +0000 (16:13 -0700)]
am 9ae6d37a: am de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google

* commit '9ae6d37ad09cad5eb3e0caa2f0b4c0a507a243f2':
  add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google

11 years agoam de295276: add javascript action events to search suggestions and search results...
Scott Main [Mon, 25 Mar 2013 23:11:44 +0000 (16:11 -0700)]
am de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google

* commit 'de2952768478e6390bcec424bb102911e7f4cbff':
  add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google

11 years agoadd javascript action events to search suggestions and search results.
Scott Main [Mon, 25 Mar 2013 22:48:35 +0000 (15:48 -0700)]
add javascript action events to search suggestions and search results.
Allows us to track and compare the success of suggested results and results from Google

Change-Id: I64750e3b96ea585de415969cad8ab46c3bbbcaf4

11 years agoMerge "Support to build vendor.img" into jb-mr2-dev
Ying Wang [Mon, 25 Mar 2013 20:48:53 +0000 (20:48 +0000)]
Merge "Support to build vendor.img" into jb-mr2-dev

11 years agoMerge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev
Dima Zavin [Mon, 25 Mar 2013 19:42:45 +0000 (19:42 +0000)]
Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev

11 years agoSupport to build vendor.img
Ying Wang [Wed, 20 Mar 2013 18:02:05 +0000 (11:02 -0700)]
Support to build vendor.img

Bug: 8341435
Change-Id: I2db7970936984d38aed35054e3f695d298f4e512

11 years agocore: combo: arm: use appropriate mcpu flags for cortex-a7
Dima Zavin [Sat, 23 Mar 2013 09:08:38 +0000 (02:08 -0700)]
core: combo: arm: use appropriate mcpu flags for cortex-a7

Change-Id: If00577d36257e4d03f63f36b159bb2e015958d6a
Signed-off-by: Dima Zavin <dima@android.com>
11 years agoam ca983c08: am 97c280ec: Merge "We have to use := instead of +="
Ying Wang [Sat, 23 Mar 2013 02:50:09 +0000 (19:50 -0700)]
am ca983c08: am 97c280ec: Merge "We have to use := instead of +="

* commit 'ca983c08fbc49b36eb0d71476842a86afbdcb8ed':
  We have to use := instead of +=

11 years agoam 97c280ec: Merge "We have to use := instead of +="
Ying Wang [Sat, 23 Mar 2013 02:47:43 +0000 (19:47 -0700)]
am 97c280ec: Merge "We have to use := instead of +="

* commit '97c280eced879fb79d32bd527412ab34840dba5c':
  We have to use := instead of +=

11 years agoMerge "We have to use := instead of +="
Ying Wang [Sat, 23 Mar 2013 01:56:36 +0000 (01:56 +0000)]
Merge "We have to use := instead of +="

11 years agoWe have to use := instead of +=
Ying Wang [Sat, 23 Mar 2013 01:52:57 +0000 (18:52 -0700)]
We have to use := instead of +=

If we use +=, the right side may be deferred to evaluate,
if that target-specific variable is not defined yet.
That's a mistke.

Change-Id: I1635ee4791473f407866e010d612948c02cdebf6

11 years agoDelete icu4j from pathmap.mk
Ying Wang [Fri, 22 Mar 2013 19:32:50 +0000 (12:32 -0700)]
Delete icu4j from pathmap.mk

frameworks/base/icu4j is gone in jb-mr2-dev.

Change-Id: I078c8ac3db85598a9b30f8220f251eb7631151e0

11 years agoam 159de1de: am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templat...
Scott Main [Fri, 22 Mar 2013 01:35:43 +0000 (18:35 -0700)]
am 159de1de: am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds

* commit '159de1de00027ebb9280cf6768d59369416c7a13':
  docs: update templates to remove global content for devsite builds

11 years agoam 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove...
Scott Main [Fri, 22 Mar 2013 01:33:53 +0000 (18:33 -0700)]
am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds

* commit '1b8b0cfee98c8d2779dc740707b547846734053f':
  docs: update templates to remove global content for devsite builds

11 years agoam 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global conten...
Scott Main [Fri, 22 Mar 2013 01:31:59 +0000 (18:31 -0700)]
am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds

* commit '7908878061144b25b1e0baf36619db7b32d07c98':
  docs: update templates to remove global content for devsite builds

11 years agoam 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite...
Scott Main [Fri, 22 Mar 2013 01:29:44 +0000 (18:29 -0700)]
am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds

* commit '8d92d9ef824f265979e68da927f01aba4bb6b314':
  docs: update templates to remove global content for devsite builds

11 years agoam 01a2545b: docs: update templates to remove global content for devsite builds
Scott Main [Fri, 22 Mar 2013 01:27:16 +0000 (18:27 -0700)]
am 01a2545b: docs: update templates to remove global content for devsite builds

* commit '01a2545bbab916e45eedbd3708f526ed8bd62935':
  docs: update templates to remove global content for devsite builds

11 years agodocs: update templates to remove global content for devsite builds
Scott Main [Wed, 13 Feb 2013 01:32:27 +0000 (17:32 -0800)]
docs: update templates to remove global content for devsite builds

Change-Id: I8c8d052248cebe6408d8c18b44baadd03f3bc96c

11 years agoam 04f27973: am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit...
Scott Main [Wed, 20 Mar 2013 22:27:05 +0000 (15:27 -0700)]
am 04f27973: am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs

* commit '04f279730970df0ea5cd8ef6e8f7a5bee6233dc6':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.

11 years agoam 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK...
Scott Main [Wed, 20 Mar 2013 22:25:10 +0000 (15:25 -0700)]
am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs

* commit '8c052d395db4643303e03efbc35eca0259cee19e':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.

11 years agoam 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to...
Scott Main [Wed, 20 Mar 2013 22:23:08 +0000 (15:23 -0700)]
am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs

* commit '82fb80eb11188592f34056e8c787a74a28be6543':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.

11 years agoam ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table...
Scott Main [Wed, 20 Mar 2013 22:20:42 +0000 (15:20 -0700)]
am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs

* commit 'ec48ff2bed11b0cbdc2686eed28a6edc75425fca':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.

11 years agoam ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same namin...
Scott Main [Wed, 20 Mar 2013 22:18:08 +0000 (15:18 -0700)]
am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs

* commit 'ec93c11194f55fb2bd9ae23fa502d701bfb09664':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.

11 years agoMerge "add 64-bit variety NDK packages to download table. Use same naming convention...
Scott Main [Wed, 20 Mar 2013 22:16:27 +0000 (22:16 +0000)]
Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs

11 years agoadd 64-bit variety NDK packages to download table.
Scott Main [Mon, 18 Mar 2013 18:31:15 +0000 (11:31 -0700)]
add 64-bit variety NDK packages to download table.
Use same naming convention as SDK packages for consistency.

Change-Id: Iee2673d6c9a4b313988e1a73966d2a0fbee27c2c

11 years agoJDQ39E
The Android Automerger [Wed, 20 Mar 2013 19:24:22 +0000 (12:24 -0700)]
JDQ39E

11 years agoam 22b048e1: am 86372f1c: am 7524d02e: am 4264799b: am 24790db1: fix indentation...
Scott Main [Tue, 19 Mar 2013 21:48:42 +0000 (14:48 -0700)]
am 22b048e1: am 86372f1c: am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists

* commit '22b048e1069c5f5dffd5f13ee4ef35f4ba06fa2b':
  fix indentation style for nested lists

11 years agoam 86372f1c: am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested...
Scott Main [Tue, 19 Mar 2013 21:48:02 +0000 (14:48 -0700)]
am 86372f1c: am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists

* commit '86372f1c0156b096288274ab85128ffbe9f6f8b4':
  fix indentation style for nested lists

11 years agoam 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:46:48 +0000 (14:46 -0700)]
am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists

* commit '7524d02ef25fed9241e507ebda53d73a643134e5':
  fix indentation style for nested lists

11 years agoam 4264799b: am 24790db1: fix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:44:53 +0000 (14:44 -0700)]
am 4264799b: am 24790db1: fix indentation style for nested lists

* commit '4264799b51dd24fdc154a1ae1b70bc4e0bf7e4a9':
  fix indentation style for nested lists

11 years agoam 24790db1: fix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:43:04 +0000 (14:43 -0700)]
am 24790db1: fix indentation style for nested lists

* commit '24790db1cd7b84c6c36350b232538e519790f799':
  fix indentation style for nested lists

11 years agofix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:38:59 +0000 (14:38 -0700)]
fix indentation style for nested lists

Change-Id: Id4e1aa6f4dacf0984cfc891081799be887543453

11 years agoam e874f3ab: am 55c06f75: Merge "Duplicate libgcc.a in front of *so"
Andrew Hsieh [Tue, 19 Mar 2013 18:17:07 +0000 (11:17 -0700)]
am e874f3ab: am 55c06f75: Merge "Duplicate libgcc.a in front of *so"

* commit 'e874f3ab7c3f70582f877e762c13c1943ed0e398':
  Duplicate libgcc.a in front of *so

11 years agoam 55c06f75: Merge "Duplicate libgcc.a in front of *so"
Andrew Hsieh [Tue, 19 Mar 2013 18:15:49 +0000 (11:15 -0700)]
am 55c06f75: Merge "Duplicate libgcc.a in front of *so"

* commit '55c06f75951c0d31560f90822cd4e5073055855c':
  Duplicate libgcc.a in front of *so

11 years agoMerge "Duplicate libgcc.a in front of *so"
Andrew Hsieh [Tue, 19 Mar 2013 17:59:50 +0000 (17:59 +0000)]
Merge "Duplicate libgcc.a in front of *so"