Commit Graph

12841 Commits

Author SHA1 Message Date
Nick Kralevich d6ca1e46c8 am 1d7bebca: am 835816ae: Merge "arm: upgrade to _FORTIFY_SOURCE=2"
* commit '1d7bebca7e09e282828fe99baab76c738bde7cd2':
  arm: upgrade to _FORTIFY_SOURCE=2
2013-04-25 21:26:46 -07:00
Nick Kralevich 1d7bebca7e am 835816ae: Merge "arm: upgrade to _FORTIFY_SOURCE=2"
* commit '835816ae9eb9de2ae7b75e2318d5eba596f1275c':
  arm: upgrade to _FORTIFY_SOURCE=2
2013-04-25 21:22:26 -07:00
Nick Kralevich 835816ae9e Merge "arm: upgrade to _FORTIFY_SOURCE=2" 2013-04-26 01:28:11 +00:00
Nick Kralevich 316f720b91 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
2013-04-25 16:52:02 -07:00
Scott Main 345e90ebae am 8579320f: 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 '8579320f382199b86e406f2bbac35dfe2bab4e08':
  re-add styles for xml definition lists. used in manifest reference pages and was lost during switch to DAC2
2013-04-25 13:50:29 -07:00
Scott Main 8579320f38 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
2013-04-25 11:27:12 -07:00
Scott Main 9a720b759e 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
2013-04-25 11:24:08 -07:00
Scott Main 499dc52cb0 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
2013-04-25 11:22:01 -07:00
Scott Main 8e1d22bc7e 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
2013-04-25 11:19:13 -07:00
Scott Main 55d6070ad9 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
2013-04-25 11:17:52 -07:00
Scott Main 78568286e1 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
2013-04-25 11:16:03 -07:00
Scott Main 8aa725e694 re-add styles for xml definition lists.
used in manifest reference pages and was lost during switch to DAC2

Change-Id: I0fcaebc37fe1665bfced4b109945c9dbf6389818
2013-04-25 11:12:51 -07:00
Matthew Xie f012cfe792 am e78c0b8c: am b1f10133: Remove DBUS from make files
* commit 'e78c0b8c359910815171ee61952ddeff834699f1':
  Remove DBUS from make files
2013-04-24 14:24:30 -07:00
Matthew Xie e78c0b8c35 am b1f10133: Remove DBUS from make files
* commit 'b1f1013321e1f64fd43a3e9fa008ac38845b773f':
  Remove DBUS from make files
2013-04-24 14:21:52 -07:00
Dianne Hackborn 1d9a826f56 Merge commit '6007ddad' into manualmerge
Keep master, drop the merge changes.
2013-04-23 14:57:47 -07:00
Matthew Xie b1f1013321 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
2013-04-23 14:01:23 -07:00
Chad Jones 918239b9f6 am 9d53a1d6: am b6c2e6b6: Merge commit \'3359ffe4\' into jb-mr2-dev
* commit '9d53a1d6094b8981c27dd500b4679c469eb166aa':
2013-04-23 11:24:12 -07:00
Dianne Hackborn 6007ddadc9 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.
2013-04-23 03:51:38 -07:00
Chad Jones 9d53a1d609 am b6c2e6b6: Merge commit \'3359ffe4\' into jb-mr2-dev
* commit 'b6c2e6b60cd9c01b853b31c29ad1c7ebbcfe2f5a':
2013-04-23 03:51:37 -07:00
Dianne Hackborn 3bad554001 Here lies JB MR2: In with a whimper, out with a bang.
Change-Id: Id75e084b8447234cf5d2c26ccd0e13111dde6684
2013-04-22 13:07:44 -07:00
Chad Jones 71678e1a5b am aa05ac49: Merge commit \'f0df12ae\' into jb-mr2-dev-plus-aosp
* commit 'aa05ac49db5c2a50baafedb816a404428cf6c482':
2013-04-20 00:14:04 -07:00
Chad Jones bd157c3017 Merge commit 'f0df12ae' 2013-04-19 20:56:28 -07:00
Chad Jones aa05ac49db Merge commit 'f0df12ae' into jb-mr2-dev-plus-aosp 2013-04-19 20:55:19 -07:00
Chad Jones b6c2e6b60c Merge commit '3359ffe4' into jb-mr2-dev 2013-04-19 20:24:07 -07:00
Robert Ly f0df12ae6a am 3359ffe4: am 062dc2c6: am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
* commit '3359ffe4ddd083dc76034ac0284b1c216fa7a633':
  sac template fixes
2013-04-19 14:34:25 -07:00
Robert Ly 3359ffe4dd am 062dc2c6: am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
* commit '062dc2c6b2b8bab43241c2d4c93f0d35e9180b2e':
  sac template fixes
2013-04-19 14:32:15 -07:00
Robert Ly 062dc2c6b2 am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
* commit 'cd197b2461281ff1d123b987dbd1c2a5b5236cd2':
  sac template fixes
2013-04-19 14:29:17 -07:00
Robert Ly cd197b2461 am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
* commit '17a52ff0682b82d99c82b5920619f6de19879a28':
  sac template fixes
2013-04-19 14:25:43 -07:00
Robert Ly 17a52ff068 am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
* commit '8b4f4f6bb3acd40e4e554ab61e3b1166686775c1':
  sac template fixes
2013-04-19 14:23:40 -07:00
Robert Ly 8b4f4f6bb3 Merge "sac template fixes" into jb-mr1.1-docs 2013-04-19 21:21:47 +00:00
Robert Ly dbfc4bbc95 sac template fixes
Change-Id: I9e3c6b60c1fab71c53408f34d388653e85e6ba30
2013-04-18 11:35:16 -07:00
Jean-Baptiste Queru b9ef03f66e am b81dc841: am f7e5c424: Reconcile with mr1.1-release
* commit 'b81dc8414a80fc1cbd809609f212702bda36f449':
  This is JER09
  This is JER08
  JER05
2013-04-17 15:13:27 -07:00
Jean-Baptiste Queru b81dc8414a am f7e5c424: Reconcile with mr1.1-release
* commit 'f7e5c424080c75e003115aa248c90468c0b9b00a':
  This is JER09
  This is JER08
  JER05
2013-04-17 15:08:22 -07:00
Jean-Baptiste Queru f7e5c42408 Reconcile with mr1.1-release
Change-Id: I61e5c59ba2ba1e1072440cc46202a88d3f89c1f7
2013-04-17 14:20:24 -07:00
Ying Wang 9c27153999 am c5cd2c6d: am b1578404: Merge "Fix /system/app/.odex not updated issue"
* commit 'c5cd2c6ddb9cfdb7938c46362682fc41fd2e9ab1':
  Fix /system/app/$app.odex not updated issue
2013-04-17 10:43:46 -07:00
Ying Wang c5cd2c6ddb am b1578404: Merge "Fix /system/app/.odex not updated issue"
* commit 'b1578404624f2369bb92a1e69c02f2ef15372002':
  Fix /system/app/$app.odex not updated issue
2013-04-17 10:30:42 -07:00
Ying Wang b157840462 Merge "Fix /system/app/$app.odex not updated issue" 2013-04-17 16:23:11 +00:00
Chih-Wei Huang 868e0c5a00 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).
2013-04-17 16:00:40 +08:00
Ying Wang c13a61e462 am 08ba77ae: am b9267c69: Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
* commit '08ba77ae565ca3c4ddfcbd5432bf7d7e3a53963f':
  Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
2013-04-16 17:42:32 -07:00
Ying Wang 08ba77ae56 am b9267c69: Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
* commit 'b9267c692084b862587af018a44b1fbe2f824d89':
  Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
2013-04-16 17:40:26 -07:00
Ying Wang b9267c6920 Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
Change-Id: Ia3647674f294c42e9fbe2163bf0d70012313bb15
2013-04-16 17:36:39 -07:00
Ying Wang 237770761f am 8150cfcb: am 9592af96: Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev
* commit '8150cfcb209dfb6ad86413cf3d4373d074f54062':
  Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES
2013-04-16 09:02:55 -07:00
Ying Wang 8150cfcb20 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
2013-04-16 09:01:11 -07:00
Ying Wang 9592af96a7 Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev 2013-04-16 15:57:48 +00:00
Dirk Dougherty 070733887a am c7ac60de: am 9b855f67: am b676ec7b: am 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.
* commit 'c7ac60deed026137f56d7ea2181d41239cd74398':
  Doc change: css for checklist more resources blocks.
2013-04-15 21:55:23 -07:00
Dirk Dougherty c7ac60deed 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.
2013-04-15 20:48:58 -07:00
Dirk Dougherty 9b855f672b 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.
2013-04-15 20:45:47 -07:00
Dirk Dougherty b676ec7b1e 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.
2013-04-15 20:43:10 -07:00
Dirk Dougherty 6cdbe88d0b 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.
2013-04-15 20:40:41 -07:00
Dirk Dougherty f23bdf7843 am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.
* commit '1e1244bfbe50ff60f8ea6c8a1579c915c1a66232':
  Doc change: css for checklist more resources blocks.
2013-04-15 20:37:59 -07:00