OSDN Git Service

android-x86/build.git
11 years agoam 9d461e30: Merge "Add v7 support libs to path map." into jb-mr2-dev
Jeff Brown [Fri, 26 Apr 2013 18:32:59 +0000 (11:32 -0700)]
am 9d461e30: Merge "Add v7 support libs to path map." into jb-mr2-dev

* commit '9d461e3080375a701c61b29d1901928e7272f4df':
  Add v7 support libs to path map.

11 years agoMerge "Add v7 support libs to path map." into jb-mr2-dev
Jeff Brown [Fri, 26 Apr 2013 18:31:05 +0000 (18:31 +0000)]
Merge "Add v7 support libs to path map." into jb-mr2-dev

11 years agoam 2dc245b9: Clean yacc version check
Ying Wang [Fri, 26 Apr 2013 18:16:09 +0000 (11:16 -0700)]
am 2dc245b9: Clean yacc version check

* commit '2dc245b9cb1a3ef52d38d704776fe3a9942b6af1':
  Clean yacc version check

11 years agoClean yacc version check
Ying Wang [Fri, 26 Apr 2013 18:13:22 +0000 (11:13 -0700)]
Clean yacc version check

We don't rely on host preinstalled bison/yacc now.

Change-Id: Iac0a7f1c12fe9d33baa53e48297ecb41ad89792d

11 years agoAdd v7 support libs to path map.
Jeff Brown [Thu, 25 Apr 2013 03:36:07 +0000 (20:36 -0700)]
Add v7 support libs to path map.

This is necessary to ensure that we correctly generate
documentation for these packages.

Bug: 8175766
Change-Id: Ia1c359c744d68f9b9423fd0e9df5516890792936

11 years agoam 835816ae: Merge "arm: upgrade to _FORTIFY_SOURCE=2"
Nick Kralevich [Fri, 26 Apr 2013 04:22:26 +0000 (21:22 -0700)]
am 835816ae: Merge "arm: upgrade to _FORTIFY_SOURCE=2"

* commit '835816ae9eb9de2ae7b75e2318d5eba596f1275c':
  arm: upgrade to _FORTIFY_SOURCE=2

11 years agoMerge "arm: upgrade to _FORTIFY_SOURCE=2"
Nick Kralevich [Fri, 26 Apr 2013 01:28:11 +0000 (01:28 +0000)]
Merge "arm: upgrade to _FORTIFY_SOURCE=2"

11 years agoarm: upgrade to _FORTIFY_SOURCE=2
Nick Kralevich [Thu, 25 Apr 2013 23:49:10 +0000 (16:49 -0700)]
arm: upgrade to _FORTIFY_SOURCE=2

Enable _FORTIFY_SOURCE=2 for ARM.

Currently, this change is a no-op, as Android's libc doesn't
support _FORTIFY_SOURCE > 1, yet.

Change-Id: Ib4c8e44e6949a37352c153e3c52a4fa001f18738

11 years agoam 9a720b75: am 499dc52c: am 8e1d22bc: am 55d6070a: am 78568286: am 8aa725e6: re...
Scott Main [Thu, 25 Apr 2013 18:27:12 +0000 (11:27 -0700)]
am 9a720b75: am 499dc52c: am 8e1d22bc: am 55d6070a: am 78568286: am 8aa725e6: re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2

* commit '9a720b759ef1c5067ccf5b48a5ed9c61b0217fe9':
  re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2

11 years agoam 499dc52c: am 8e1d22bc: am 55d6070a: am 78568286: am 8aa725e6: re-add styles for...
Scott Main [Thu, 25 Apr 2013 18:24:08 +0000 (11:24 -0700)]
am 499dc52c: am 8e1d22bc: am 55d6070a: am 78568286: am 8aa725e6: re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2

* commit '499dc52cb073d98d2168a75ff312db5e3cee49dd':
  re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2

11 years agoam 8e1d22bc: am 55d6070a: am 78568286: am 8aa725e6: re-add styles for xml definition...
Scott Main [Thu, 25 Apr 2013 18:22:01 +0000 (11:22 -0700)]
am 8e1d22bc: am 55d6070a: am 78568286: am 8aa725e6: re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2

* commit '8e1d22bc7edf9dd75e3cfbf373fc1170b809818a':
  re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2

11 years agoam 55d6070a: am 78568286: am 8aa725e6: re-add styles for xml definition lists. used...
Scott Main [Thu, 25 Apr 2013 18:19:13 +0000 (11:19 -0700)]
am 55d6070a: am 78568286: am 8aa725e6: re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2

* commit '55d6070ad9d9d1f0d603434d77e2c6a22b858b0d':
  re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2

11 years agoam 78568286: am 8aa725e6: re-add styles for xml definition lists. used in manifest...
Scott Main [Thu, 25 Apr 2013 18:17:52 +0000 (11:17 -0700)]
am 78568286: am 8aa725e6: re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2

* commit '78568286e1818b0a49e72267d31d0283d0faad71':
  re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2

11 years agoam 8aa725e6: re-add styles for xml definition lists. used in manifest reference pages...
Scott Main [Thu, 25 Apr 2013 18:16:03 +0000 (11:16 -0700)]
am 8aa725e6: re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2

* commit '8aa725e6947b3413a19643582f5cbe704354807a':
  re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2

11 years agore-add styles for xml definition lists.
Scott Main [Thu, 25 Apr 2013 17:00:32 +0000 (10:00 -0700)]
re-add styles for xml definition lists.
used in manifest reference pages and was lost during switch to DAC2

Change-Id: I0fcaebc37fe1665bfced4b109945c9dbf6389818

11 years agoam b1f10133: Remove DBUS from make files
Matthew Xie [Wed, 24 Apr 2013 21:21:52 +0000 (14:21 -0700)]
am b1f10133: Remove DBUS from make files

* commit 'b1f1013321e1f64fd43a3e9fa008ac38845b773f':
  Remove DBUS from make files

11 years agoRemove DBUS from make files
Matthew Xie [Tue, 23 Apr 2013 19:24:28 +0000 (12:24 -0700)]
Remove DBUS from make files

DBUS had been needed by bluetooth bluz stack. It is not needed after
we replaced bluez stack with bluedroid stack.
bug 6872904

Change-Id: I952624e61c1e570c7e8d5a23937ab93a173d135c

11 years agoam 3bad5540: Here lies JB MR2: In with a whimper, out with a bang.
Dianne Hackborn [Tue, 23 Apr 2013 10:51:38 +0000 (03:51 -0700)]
am 3bad5540: Here lies JB MR2: In with a whimper, out with a bang.

* commit '3bad5540018f191ce61ce8c8df4e096275044d14':
  Here lies JB MR2: In with a whimper, out with a bang.

11 years agoam b6c2e6b6: Merge commit \'3359ffe4\' into jb-mr2-dev
Chad Jones [Tue, 23 Apr 2013 10:51:37 +0000 (03:51 -0700)]
am b6c2e6b6: Merge commit \'3359ffe4\' into jb-mr2-dev

* commit 'b6c2e6b60cd9c01b853b31c29ad1c7ebbcfe2f5a':

11 years agoHere lies JB MR2: In with a whimper, out with a bang.
Dianne Hackborn [Mon, 22 Apr 2013 20:07:44 +0000 (13:07 -0700)]
Here lies JB MR2: In with a whimper, out with a bang.

Change-Id: Id75e084b8447234cf5d2c26ccd0e13111dde6684

11 years agoMerge commit 'f0df12ae' into jb-mr2-dev-plus-aosp
Chad Jones [Sat, 20 Apr 2013 03:55:19 +0000 (20:55 -0700)]
Merge commit 'f0df12ae' into jb-mr2-dev-plus-aosp

11 years agoMerge commit '3359ffe4' into jb-mr2-dev
Chad Jones [Sat, 20 Apr 2013 03:24:07 +0000 (20:24 -0700)]
Merge commit '3359ffe4' into jb-mr2-dev

11 years agoam 3359ffe4: am 062dc2c6: am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template...
Robert Ly [Fri, 19 Apr 2013 21:34:25 +0000 (14:34 -0700)]
am 3359ffe4: am 062dc2c6: am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs

* commit '3359ffe4ddd083dc76034ac0284b1c216fa7a633':
  sac template fixes

11 years agoam 062dc2c6: am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into...
Robert Ly [Fri, 19 Apr 2013 21:32:15 +0000 (14:32 -0700)]
am 062dc2c6: am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs

* commit '062dc2c6b2b8bab43241c2d4c93f0d35e9180b2e':
  sac template fixes

11 years agoam cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
Robert Ly [Fri, 19 Apr 2013 21:29:17 +0000 (14:29 -0700)]
am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs

* commit 'cd197b2461281ff1d123b987dbd1c2a5b5236cd2':
  sac template fixes

11 years agoam 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
Robert Ly [Fri, 19 Apr 2013 21:25:43 +0000 (14:25 -0700)]
am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs

* commit '17a52ff0682b82d99c82b5920619f6de19879a28':
  sac template fixes

11 years agoam 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
Robert Ly [Fri, 19 Apr 2013 21:23:40 +0000 (14:23 -0700)]
am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs

* commit '8b4f4f6bb3acd40e4e554ab61e3b1166686775c1':
  sac template fixes

11 years agoMerge "sac template fixes" into jb-mr1.1-docs
Robert Ly [Fri, 19 Apr 2013 21:21:47 +0000 (21:21 +0000)]
Merge "sac template fixes" into jb-mr1.1-docs

11 years agosac template fixes
Robert Ly [Thu, 18 Apr 2013 18:35:16 +0000 (11:35 -0700)]
sac template fixes

Change-Id: I9e3c6b60c1fab71c53408f34d388653e85e6ba30

11 years agoam f7e5c424: Reconcile with mr1.1-release
Jean-Baptiste Queru [Wed, 17 Apr 2013 22:08:22 +0000 (15:08 -0700)]
am f7e5c424: Reconcile with mr1.1-release

* commit 'f7e5c424080c75e003115aa248c90468c0b9b00a':
  This is JER09
  This is JER08
  JER05

11 years agoReconcile with mr1.1-release
Jean-Baptiste Queru [Wed, 17 Apr 2013 21:17:15 +0000 (14:17 -0700)]
Reconcile with mr1.1-release

Change-Id: I61e5c59ba2ba1e1072440cc46202a88d3f89c1f7

11 years agoam b1578404: Merge "Fix /system/app/.odex not updated issue"
Ying Wang [Wed, 17 Apr 2013 17:30:42 +0000 (10:30 -0700)]
am b1578404: Merge "Fix /system/app/.odex not updated issue"

* commit 'b1578404624f2369bb92a1e69c02f2ef15372002':
  Fix /system/app/$app.odex not updated issue

11 years agoMerge "Fix /system/app/$app.odex not updated issue"
Ying Wang [Wed, 17 Apr 2013 16:23:10 +0000 (16:23 +0000)]
Merge "Fix /system/app/$app.odex not updated issue"

11 years agoFix /system/app/$app.odex not updated issue
Chih-Wei Huang [Mon, 15 Apr 2013 09:12:19 +0000 (17:12 +0800)]
Fix /system/app/$app.odex not updated issue

$(built_odex) depends on $(LOCAL_BUILT_MODULE) but doesn't have any build
recipe. It is built by the rules of $(LOCAL_BUILT_MODULE) that results in
a subtle bug: $(built_odex) is always newer than $(LOCAL_BUILT_MODULE)
if $(LOCAL_BUILT_MODULE) rebuilt. Therefore 'make' thinks the targets
(/system/app/$app.odex) depending on $(built_odex) don't need to be updated.
It seems an allegedly optimization bug of 'make'.

The simple fix is to explicitly add $(LOCAL_BUILT_MODULE) as a dependency
of $(installed_odex).

11 years agoam b9267c69: Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
Ying Wang [Wed, 17 Apr 2013 00:40:26 +0000 (17:40 -0700)]
am b9267c69: Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools

* commit 'b9267c692084b862587af018a44b1fbe2f824d89':
  Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools

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

11 years agoam 9592af96: Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES...
Ying Wang [Tue, 16 Apr 2013 16:01:11 +0000 (09:01 -0700)]
am 9592af96: Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev

* commit '9592af96a7ab330b537a4d65474177805bba2ac1':
  Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES

11 years agoMerge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev
Ying Wang [Tue, 16 Apr 2013 15:57:48 +0000 (15:57 +0000)]
Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev

11 years agoam 9b855f67: am b676ec7b: am 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am...
Dirk Dougherty [Tue, 16 Apr 2013 03:48:58 +0000 (20:48 -0700)]
am 9b855f67: am b676ec7b: am 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.

* commit '9b855f672bfe106f2628746a69150717b0c440dd':
  Doc change: css for checklist more resources blocks.

11 years agoam b676ec7b: am 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc...
Dirk Dougherty [Tue, 16 Apr 2013 03:45:47 +0000 (20:45 -0700)]
am b676ec7b: am 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.

* commit 'b676ec7b1e2e0764de85547a4b91294d16d32a3b':
  Doc change: css for checklist more resources blocks.

11 years agoam 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css...
Dirk Dougherty [Tue, 16 Apr 2013 03:43:10 +0000 (20:43 -0700)]
am 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.

* commit '6cdbe88d0bad6723e50d91585a1f3328e5b77368':
  Doc change: css for checklist more resources blocks.

11 years agoam f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist...
Dirk Dougherty [Tue, 16 Apr 2013 03:40:41 +0000 (20:40 -0700)]
am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.

* commit 'f23bdf7843782671f1f15439e4b74cbe56031f8c':
  Doc change: css for checklist more resources blocks.

11 years agoam 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources...
Dirk Dougherty [Tue, 16 Apr 2013 03:37:59 +0000 (20:37 -0700)]
am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.

* commit '1e1244bfbe50ff60f8ea6c8a1579c915c1a66232':
  Doc change: css for checklist more resources blocks.

11 years agoam a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.
Dirk Dougherty [Tue, 16 Apr 2013 03:33:54 +0000 (20:33 -0700)]
am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.

* commit 'a32f1bb4e44e932dcb6b1e17fe8c5f2dbb8127df':
  Doc change: css for checklist more resources blocks.

11 years agoam 547d9e93: Doc change: css for checklist more resources blocks.
Dirk Dougherty [Tue, 16 Apr 2013 03:30:00 +0000 (20:30 -0700)]
am 547d9e93: Doc change: css for checklist more resources blocks.

* commit '547d9e93b21e62f1153aaac49c22b1f648b4fef5':
  Doc change: css for checklist more resources blocks.

11 years agoDoc change: css for checklist more resources blocks.
Dirk Dougherty [Tue, 16 Apr 2013 01:13:47 +0000 (18:13 -0700)]
Doc change: css for checklist more resources blocks.

Change-Id: If0678b08d135f708bf6ecee49831ef233a862389

11 years agoDo vendor check on modules installed by LOCAL_SHARED_LIBRARIES
Ying Wang [Tue, 16 Apr 2013 00:32:21 +0000 (17:32 -0700)]
Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES

Since commit 6c86a1 we have split LOCAL_SHARED_LIBRARIES out of
LOCAL_REQUIRED_MODULES and the vendor check does no longer cover the
installed modules introduced by LOCAL_SHARED_LIBRARIES.
This change brings back the coverage.

Change-Id: Ie78692e48f173a3350792eb2fee8127ff9433caa

11 years agoam befd7fe6: am 7f8fd3b1: am 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am...
Dirk Dougherty [Mon, 15 Apr 2013 22:54:00 +0000 (15:54 -0700)]
am befd7fe6: am 7f8fd3b1: am 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.

* commit 'befd7fe6e7caf6c00d72e1ed375fa6fac1a56e93':
  Doc change: css for policy docs.

11 years agoam 7f8fd3b1: am 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc...
Dirk Dougherty [Mon, 15 Apr 2013 22:51:22 +0000 (15:51 -0700)]
am 7f8fd3b1: am 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.

* commit '7f8fd3b1333084f9e291a1948d6ef73daeccbc70':
  Doc change: css for policy docs.

11 years agoam 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css...
Dirk Dougherty [Mon, 15 Apr 2013 22:47:08 +0000 (15:47 -0700)]
am 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.

* commit '7098897fecff6ec586a078025676b8203ab2060d':
  Doc change: css for policy docs.

11 years agoam 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.
Dirk Dougherty [Mon, 15 Apr 2013 22:44:44 +0000 (15:44 -0700)]
am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.

* commit '53facc05af437f0721646102442c61c49b2e33be':
  Doc change: css for policy docs.

11 years agoam 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.
Dirk Dougherty [Mon, 15 Apr 2013 22:41:54 +0000 (15:41 -0700)]
am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.

* commit '4f425e4284024e21c7e65a7840d8e1a45d916756':
  Doc change: css for policy docs.

11 years agoam 48732d9a: am bec14294: Doc change: css for policy docs.
Dirk Dougherty [Mon, 15 Apr 2013 22:37:54 +0000 (15:37 -0700)]
am 48732d9a: am bec14294: Doc change: css for policy docs.

* commit '48732d9aaa765576d98f07fabd856a17528cb826':
  Doc change: css for policy docs.

11 years agoam bec14294: Doc change: css for policy docs.
Dirk Dougherty [Mon, 15 Apr 2013 22:34:05 +0000 (15:34 -0700)]
am bec14294: Doc change: css for policy docs.

* commit 'bec142949a33bf7d195d022e9ec99a1a84197065':
  Doc change: css for policy docs.

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Mon, 15 Apr 2013 17:45:43 +0000 (10:45 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I49eb0fa91c0c510075419629195dcb27b9359e7d

11 years ago"JWR15"
The Android Automerger [Mon, 15 Apr 2013 12:57:31 +0000 (05:57 -0700)]
"JWR15"

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 15 Apr 2013 12:55:22 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoJWR11G
The Android Automerger [Sat, 13 Apr 2013 01:15:42 +0000 (18:15 -0700)]
JWR11G

11 years agoJWR11F
The Android Automerger [Fri, 12 Apr 2013 23:20:46 +0000 (16:20 -0700)]
JWR11F

11 years agoJWR11E
The Android Automerger [Fri, 12 Apr 2013 21:32:07 +0000 (14:32 -0700)]
JWR11E

11 years agoJWR11D
The Android Automerger [Fri, 12 Apr 2013 18:30:53 +0000 (11:30 -0700)]
JWR11D

11 years ago"JWR11C"
The Android Automerger [Fri, 12 Apr 2013 06:22:16 +0000 (23:22 -0700)]
"JWR11C"

11 years agoDoc change: css for policy docs.
Dirk Dougherty [Thu, 11 Apr 2013 03:23:40 +0000 (20:23 -0700)]
Doc change: css for policy docs.

Change-Id: I5d8609d7e20315e5bb022f057704b2814ad9e172

11 years agoam 021aa4ce: Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev
Jeff Sharkey [Fri, 12 Apr 2013 00:14:48 +0000 (17:14 -0700)]
am 021aa4ce: Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev

* commit '021aa4cefe03fd7cca5ee4baf25a562c6f6cda20':
  DO NOT MERGE. Fix build by removing old file.

11 years agoMerge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev
Jeff Sharkey [Fri, 12 Apr 2013 00:12:00 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev

11 years agoDO NOT MERGE. Fix build by removing old file.
Jeff Sharkey [Thu, 11 Apr 2013 22:37:13 +0000 (15:37 -0700)]
DO NOT MERGE. Fix build by removing old file.

Change-Id: I2fb4d27acfabb9283d54958f0438a6db74641dd2

11 years agoam 14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev
Ying Wang [Thu, 11 Apr 2013 23:00:58 +0000 (16:00 -0700)]
am 14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev

* commit '14ae6e87c9822018e7fc139f66e60b4db6b08edb':
  Get rid of the liblog hack.

11 years agoMerge "Get rid of the liblog hack." into jb-mr2-dev
Ying Wang [Thu, 11 Apr 2013 22:56:20 +0000 (22:56 +0000)]
Merge "Get rid of the liblog hack." into jb-mr2-dev

11 years agoJWR11B
The Android Automerger [Thu, 11 Apr 2013 21:44:38 +0000 (14:44 -0700)]
JWR11B

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 11 Apr 2013 14:44:59 +0000 (07:44 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I55884a9acd85fee2a3b45f5262b074731ca9ea16

11 years ago"JWR11"
The Android Automerger [Thu, 11 Apr 2013 12:57:18 +0000 (05:57 -0700)]
"JWR11"

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 11 Apr 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam 3e556091: Support to dist unbundled files for bundled build
Ying Wang [Thu, 11 Apr 2013 05:09:47 +0000 (22:09 -0700)]
am 3e556091: Support to dist unbundled files for bundled build

* commit '3e55609134381cadfc3b69657a5598dc3d8f2e35':
  Support to dist unbundled files for bundled build

11 years agoSupport to dist unbundled files for bundled build
Ying Wang [Thu, 11 Apr 2013 02:17:41 +0000 (19:17 -0700)]
Support to dist unbundled files for bundled build

Usage:
LOCAL_DIST_BUNDLED_BINARIES := true
The dist files will include the jni shared libraries and the apk with
jni libraries stripped.

Bug: 8181626
Change-Id: I4a047d786ad35b948b4ad7a51adf37321dbe395c

11 years agoJWR10C
The Android Automerger [Thu, 11 Apr 2013 02:07:13 +0000 (19:07 -0700)]
JWR10C

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: I3ece860673eb52a2db1421db4492c9b1807dda6e

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Wed, 10 Apr 2013 22:31:33 +0000 (15:31 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I7df2e132b28a7491cab9dbb36f64c8058f60a0e9

11 years agoam c04a8282: Revert "Get rid of the liblog hack."
Ying Wang [Wed, 10 Apr 2013 22:14:23 +0000 (15:14 -0700)]
am c04a8282: Revert "Get rid of the liblog hack."

* commit 'c04a8282229b624eb3aff506fb72e5fcf27b258f':
  Revert "Get rid of the liblog hack."

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 agoJWR10B
The Android Automerger [Wed, 10 Apr 2013 19:18:38 +0000 (12:18 -0700)]
JWR10B

11 years agoam 76365787: Get rid of the liblog hack.
Ying Wang [Wed, 10 Apr 2013 17:09:06 +0000 (10:09 -0700)]
am 76365787: Get rid of the liblog hack.

* commit '7636578729ffcd02bfb5158db884f559a52d8905':
  Get rid of the liblog hack.

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Wed, 10 Apr 2013 17:05:13 +0000 (10:05 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: Id8df255f1ee96ac589ce42c921ff5098c9507331

11 years ago"JWR10"
The Android Automerger [Wed, 10 Apr 2013 12:57:46 +0000 (05:57 -0700)]
"JWR10"

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 10 Apr 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

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 agoam 8c431c15: Add liblog
Ying Wang [Wed, 10 Apr 2013 05:37:04 +0000 (22:37 -0700)]
am 8c431c15: Add liblog

* commit '8c431c157de1fd61df726951e0a08cabb2477bb0':
  Add liblog

11 years agoam fd068148: Merge "Revert "Add liblog"" into jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 05:37:04 +0000 (22:37 -0700)]
am fd068148: Merge "Revert "Add liblog"" into jb-mr2-dev

* commit 'fd068148d64cabd318a7d426840c5127f7a91160':
  Revert "Add liblog"

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 agoam 134ec88c: Merge "Add liblog" into jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 05:17:07 +0000 (22:17 -0700)]
am 134ec88c: Merge "Add liblog" into jb-mr2-dev

* commit '134ec88c943ad0453d5716edceacca46a621e026':
  Add liblog

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 agoJWR09C
The Android Automerger [Tue, 9 Apr 2013 23:00:25 +0000 (16:00 -0700)]
JWR09C

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

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

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