OSDN Git Service

android-x86/build.git
11 years agoam f5cc87ba: (-s ours) am 60573fd6: (-s ours) Reconcile with jb-nakasig-release jb...
The Android Open Source Project [Wed, 12 Sep 2012 14:52:59 +0000 (07:52 -0700)]
am f5cc87ba: (-s ours) am 60573fd6: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release - do not merge

* commit 'f5cc87bae46e9aa3ebdca60f047b2bfe15132f54':
  JZO54G
  JGO73
  JZO54F
  JGO72
  JGO71
  JGO70

11 years agoam 60573fd6: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release - do not...
The Android Open Source Project [Wed, 12 Sep 2012 14:50:14 +0000 (07:50 -0700)]
am 60573fd6: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release - do not merge

* commit '60573fd6083162f6a6adaa73e6978c93b76c0cb3':
  JZO54G
  JGO73
  JZO54F
  JGO72
  JGO71
  JGO70

11 years agoReconcile with jb-nakasig-release jb-mr0-release - do not merge
The Android Open Source Project [Wed, 12 Sep 2012 14:49:09 +0000 (07:49 -0700)]
Reconcile with jb-nakasig-release jb-mr0-release - do not merge

Change-Id: Ieff44ac588f6e8b8dd4ec52f28b94d38fbf985ca

11 years agoJZO54G
The Android Automerger [Wed, 12 Sep 2012 05:18:30 +0000 (22:18 -0700)]
JZO54G

11 years agoam b050ed29: am 5f4e1ac6: am ee7cb463: Merge "add \'small\' style for long headings...
Scott Main [Tue, 11 Sep 2012 21:46:13 +0000 (14:46 -0700)]
am b050ed29: am 5f4e1ac6: am ee7cb463: Merge "add \'small\' style for long headings in Training courses" into jb-dev

* commit 'b050ed294a8e8339925fcc5fe1def7d9cb68fe1d':
  add 'small' style for long headings in Training courses

11 years agoam 5f4e1ac6: am ee7cb463: Merge "add \'small\' style for long headings in Training...
Scott Main [Tue, 11 Sep 2012 21:44:07 +0000 (14:44 -0700)]
am 5f4e1ac6: am ee7cb463: Merge "add \'small\' style for long headings in Training courses" into jb-dev

* commit '5f4e1ac6ee30784e458df3d90c0950595ad810a6':
  add 'small' style for long headings in Training courses

11 years agoam ee7cb463: Merge "add \'small\' style for long headings in Training courses" into...
Scott Main [Tue, 11 Sep 2012 21:42:43 +0000 (14:42 -0700)]
am ee7cb463: Merge "add \'small\' style for long headings in Training courses" into jb-dev

* commit 'ee7cb4637dd257e0f9610ed87d14ab10d07bd106':
  add 'small' style for long headings in Training courses

11 years agoMerge "add 'small' style for long headings in Training courses" into jb-dev
Scott Main [Tue, 11 Sep 2012 21:41:28 +0000 (14:41 -0700)]
Merge "add 'small' style for long headings in Training courses" into jb-dev

11 years agoadd 'small' style for long headings in Training courses
Scott Main [Tue, 11 Sep 2012 21:27:34 +0000 (14:27 -0700)]
add 'small' style for long headings in Training courses

Change-Id: I385df22d12ad419ad6883c0e94d3053e7e520a09

11 years agoam aadbb3d3: am 930d2b5c: am 6a6723a0: am 4458452e: Merge "android.core.vm-tests...
Ying Wang [Tue, 11 Sep 2012 19:18:40 +0000 (12:18 -0700)]
am aadbb3d3: am 930d2b5c: am 6a6723a0: am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."

* commit 'aadbb3d3b2a41db5c6b4b85ae31577b706ffa3b1':
  android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.

11 years agoam 930d2b5c: am 6a6723a0: am 4458452e: Merge "android.core.vm-tests-tf.jar path chang...
Ying Wang [Tue, 11 Sep 2012 19:16:46 +0000 (12:16 -0700)]
am 930d2b5c: am 6a6723a0: am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."

* commit '930d2b5c3ff8727fc94609b7f9c40ef8e10a30d0':
  android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.

11 years agoam 6a6723a0: am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST...
Ying Wang [Tue, 11 Sep 2012 19:14:34 +0000 (12:14 -0700)]
am 6a6723a0: am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."

* commit '6a6723a0a9c2b3c1756ce8cdf1910ade264c26ef':
  android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.

11 years agoam 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
Ying Wang [Tue, 11 Sep 2012 19:12:23 +0000 (12:12 -0700)]
am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."

* commit '4458452ef64f271906914e79ffd9923630ae22f2':
  android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.

11 years agoMerge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
Ying Wang [Tue, 11 Sep 2012 18:49:11 +0000 (11:49 -0700)]
Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."

11 years agoandroid.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
Ying Wang [Tue, 21 Aug 2012 18:54:49 +0000 (11:54 -0700)]
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.

Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e

11 years agoJGO73
The Android Automerger [Tue, 11 Sep 2012 16:54:42 +0000 (09:54 -0700)]
JGO73

11 years agomerge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Tue, 11 Sep 2012 16:54:29 +0000 (09:54 -0700)]
merge in jb-nakasig-release history after reset to jb-dev

11 years agoJZO54F
The Android Automerger [Mon, 10 Sep 2012 22:11:04 +0000 (15:11 -0700)]
JZO54F

11 years agoam 55861069: am 4595d7d6: am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args"
Ying Wang [Mon, 10 Sep 2012 17:27:33 +0000 (10:27 -0700)]
am 55861069: am 4595d7d6: am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args"

* commit '558610694400a8245dd2cfea5790af5e642d8465':
  Add transform-d-to-p-args

11 years agoam 4595d7d6: am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args"
Ying Wang [Mon, 10 Sep 2012 17:25:41 +0000 (10:25 -0700)]
am 4595d7d6: am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args"

* commit '4595d7d62c0d594aa3501e4f547563348a3a5eb0':
  Add transform-d-to-p-args

11 years agoam 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args"
Ying Wang [Mon, 10 Sep 2012 17:23:29 +0000 (10:23 -0700)]
am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args"

* commit '410420ed667f869e15df0d3204834282984d4f6a':
  Add transform-d-to-p-args

11 years agoam 9efa5bae: Merge "Add transform-d-to-p-args"
Ying Wang [Mon, 10 Sep 2012 17:21:57 +0000 (10:21 -0700)]
am 9efa5bae: Merge "Add transform-d-to-p-args"

* commit '9efa5bae8645988a0d24af14142df9572bf7bd57':
  Add transform-d-to-p-args

11 years agoMerge "Add transform-d-to-p-args"
Ying Wang [Mon, 10 Sep 2012 16:48:26 +0000 (09:48 -0700)]
Merge "Add transform-d-to-p-args"

11 years agoJGO72
The Android Automerger [Mon, 10 Sep 2012 15:09:13 +0000 (08:09 -0700)]
JGO72

11 years agomerge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Mon, 10 Sep 2012 15:09:11 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev

11 years agoJGO71
The Android Automerger [Sun, 9 Sep 2012 15:09:10 +0000 (08:09 -0700)]
JGO71

11 years agomerge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Sun, 9 Sep 2012 15:09:06 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev

11 years agoJGO70
The Android Automerger [Sat, 8 Sep 2012 15:09:14 +0000 (08:09 -0700)]
JGO70

11 years agomerge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Sat, 8 Sep 2012 15:09:05 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev

11 years agoAdd transform-d-to-p-args
Ying Wang [Sat, 8 Sep 2012 00:04:06 +0000 (17:04 -0700)]
Add transform-d-to-p-args

This new indirection allows us too to output .P files when we are
generating non-.o files, such as .s or .S files.
Bug: 7127743

Change-Id: I9e46c417031764fefc9909ba4a3eb63885f34f9e

11 years agoam 243b0dc1: am 65cdbdcd: am 65511c0a: fix script bug. we were running some scripts...
Scott Main [Fri, 7 Sep 2012 23:44:49 +0000 (16:44 -0700)]
am 243b0dc1: am 65cdbdcd: am 65511c0a: fix script bug. we were running some scripts that are only used in the reference

* commit '243b0dc1368b44fe90c26d993abc3df41042d2e9':
  fix script bug. we were running some scripts that are only used in the reference

11 years agoam b2c31c3e: (-s ours) am a7b0ec3c: (-s ours) Reconcile with jb-nakasig-release jb...
The Android Open Source Project [Fri, 7 Sep 2012 23:43:44 +0000 (16:43 -0700)]
am b2c31c3e: (-s ours) am a7b0ec3c: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge

* commit 'b2c31c3ec814479bde1d0f7ed633653a8045a081':
  JRO03W
  JRO69
  JGO69
  JGO68
  JGO67
  JZO54E

11 years agoam 65cdbdcd: am 65511c0a: fix script bug. we were running some scripts that are only...
Scott Main [Fri, 7 Sep 2012 23:19:11 +0000 (16:19 -0700)]
am 65cdbdcd: am 65511c0a: fix script bug. we were running some scripts that are only used in the reference

* commit '65cdbdcdf09f8884141b2478e1eb4d48397880d9':
  fix script bug. we were running some scripts that are only used in the reference

11 years agoam 65511c0a: fix script bug. we were running some scripts that are only used in the...
Scott Main [Fri, 7 Sep 2012 23:17:11 +0000 (16:17 -0700)]
am 65511c0a: fix script bug. we were running some scripts that are only used in the reference

* commit '65511c0a726751e9973486198086d8db6a141455':
  fix script bug. we were running some scripts that are only used in the reference

11 years agofix script bug. we were running some scripts that are only used in the reference
Scott Main [Fri, 7 Sep 2012 22:51:32 +0000 (15:51 -0700)]
fix script bug. we were running some scripts that are only used in the reference

Change-Id: I0693a7a7af5e41283942b387e53a254903b83427

11 years agoam a7b0ec3c: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release jb-release...
The Android Open Source Project [Fri, 7 Sep 2012 22:22:29 +0000 (15:22 -0700)]
am a7b0ec3c: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge

* commit 'a7b0ec3c4892ae20a0726debc3f3642dbada7bc7':
  JRO03W
  JRO69
  JGO69
  JGO68
  JGO67
  JZO54E

11 years agoReconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge
The Android Open Source Project [Fri, 7 Sep 2012 22:20:57 +0000 (15:20 -0700)]
Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge

Change-Id: Ibb66fb1e9c4c3066c8a27139922300a511ff9e7b

11 years agoam 86eab597: am b4199b86: am 1c27ac0e: am 1b70bb21: Merge "Clean step for libc."
Ying Wang [Fri, 7 Sep 2012 20:41:42 +0000 (13:41 -0700)]
am 86eab597: am b4199b86: am 1c27ac0e: am 1b70bb21: Merge "Clean step for libc."

* commit '86eab5978362ba8c1ad7a436994a7f20c679b313':
  Clean step for libc.

11 years agoam 63c38715: Clean up the crt*.o files.
Ying Wang [Fri, 7 Sep 2012 20:41:40 +0000 (13:41 -0700)]
am 63c38715: Clean up the crt*.o files.

* commit '63c38715028239a524e84cddb65277caaba9fbf3':
  Clean up the crt*.o files.

11 years agoam 4c3e2810: (-s ours) am 11f26123: (-s ours) Reconcile with jb-mr0-release jb-releas...
The Android Open Source Project [Fri, 7 Sep 2012 20:41:05 +0000 (13:41 -0700)]
am 4c3e2810: (-s ours) am 11f26123: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit '4c3e2810b7e70a76102ea9aaa57633f4c7426598':
  JZO54D
  JZO54C
  Add make_ext4fs to all builds
  JZO54B
  JRO03V
  JRO03V

11 years agoJRO03W
The Android Automerger [Fri, 7 Sep 2012 17:29:09 +0000 (10:29 -0700)]
JRO03W

11 years agoJRO69
The Android Automerger [Fri, 7 Sep 2012 17:28:17 +0000 (10:28 -0700)]
JRO69

11 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 7 Sep 2012 17:28:12 +0000 (10:28 -0700)]
merge in jb-release history after reset to jb-dev

11 years agoJGO69
The Android Automerger [Fri, 7 Sep 2012 15:09:06 +0000 (08:09 -0700)]
JGO69

11 years agomerge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Fri, 7 Sep 2012 15:09:00 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev

11 years agoJGO68
The Android Automerger [Thu, 6 Sep 2012 22:09:18 +0000 (15:09 -0700)]
JGO68

11 years agomerge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Thu, 6 Sep 2012 22:09:17 +0000 (15:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev

11 years agoJGO67
The Android Automerger [Thu, 6 Sep 2012 22:08:50 +0000 (15:08 -0700)]
JGO67

11 years agoJZO54E
The Android Automerger [Thu, 6 Sep 2012 20:30:11 +0000 (13:30 -0700)]
JZO54E

11 years agoam b4199b86: am 1c27ac0e: am 1b70bb21: Merge "Clean step for libc."
Ying Wang [Thu, 6 Sep 2012 17:44:12 +0000 (10:44 -0700)]
am b4199b86: am 1c27ac0e: am 1b70bb21: Merge "Clean step for libc."

* commit 'b4199b869bcc3b8dff6572c682fe09f74660268e':
  Clean step for libc.

11 years agoam 1c27ac0e: am 1b70bb21: Merge "Clean step for libc."
Ying Wang [Thu, 6 Sep 2012 17:43:07 +0000 (10:43 -0700)]
am 1c27ac0e: am 1b70bb21: Merge "Clean step for libc."

* commit '1c27ac0ea9d2e43d8ff05c61aa4fe6f3d9558334':
  Clean step for libc.

11 years agoam 1b70bb21: Merge "Clean step for libc."
Ying Wang [Thu, 6 Sep 2012 17:40:43 +0000 (10:40 -0700)]
am 1b70bb21: Merge "Clean step for libc."

* commit '1b70bb2162d74a304bd0d00674a0fed80f936961':
  Clean step for libc.

11 years agoMerge "Clean step for libc."
Ying Wang [Thu, 6 Sep 2012 17:36:30 +0000 (10:36 -0700)]
Merge "Clean step for libc."

11 years agoClean step for libc.
Ying Wang [Wed, 5 Sep 2012 22:58:29 +0000 (15:58 -0700)]
Clean step for libc.

(cherry-pick of ab1e93d4d4f4a46fa922df5ba7ccd41dde1221ac.)

Change-Id: I304312d6eb0346c050d02bd834565e0d43d8b4dd

11 years agoClean up the crt*.o files.
Ying Wang [Thu, 6 Sep 2012 17:29:49 +0000 (10:29 -0700)]
Clean up the crt*.o files.

To fix incremental build failure caused by
https://android-review.googlesource.com/41940

Change-Id: I9a977fe6e26fefaababdbb5d498b63e37884a4be

11 years agoam 11f26123: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
The Android Open Source Project [Thu, 6 Sep 2012 16:11:29 +0000 (09:11 -0700)]
am 11f26123: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit '11f2612325a38dadb78d9d23146b57fa3330d00c':
  JZO54D
  JZO54C
  Add make_ext4fs to all builds
  JZO54B
  JRO03V
  JRO03V

11 years agoReconcile with jb-mr0-release jb-release - do not merge
The Android Open Source Project [Thu, 6 Sep 2012 15:08:09 +0000 (08:08 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge

Change-Id: I788e28f1f2a2d2a41c5c49097da31417b476cfcb

11 years agoam 19c06156: am 0ee362ea: am 478d0fc6: Merge "Remove duplicate src:dest pairs in...
Ying Wang [Thu, 6 Sep 2012 01:39:55 +0000 (18:39 -0700)]
am 19c06156: am 0ee362ea: am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"

* commit '19c06156b6615ba53d81d2ecdc341c3feea21662':
  Remove duplicate src:dest pairs in PRODUCT_COPY_FILES

11 years agoam 0ee362ea: am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
Ying Wang [Thu, 6 Sep 2012 01:37:46 +0000 (18:37 -0700)]
am 0ee362ea: am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"

* commit '0ee362ea0485f6885c81fa1a6cb9868ae304f3e3':
  Remove duplicate src:dest pairs in PRODUCT_COPY_FILES

11 years agoam 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
Ying Wang [Thu, 6 Sep 2012 01:35:50 +0000 (18:35 -0700)]
am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"

* commit '478d0fc6a311b236fddc9d18c9a1b922f8ecf1ea':
  Remove duplicate src:dest pairs in PRODUCT_COPY_FILES

11 years agoMerge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
Ying Wang [Thu, 6 Sep 2012 01:15:11 +0000 (18:15 -0700)]
Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"

11 years agoRemove duplicate src:dest pairs in PRODUCT_COPY_FILES
Ying Wang [Thu, 6 Sep 2012 01:08:29 +0000 (18:08 -0700)]
Remove duplicate src:dest pairs in PRODUCT_COPY_FILES

Before setting up the rules.

Change-Id: Ifedbc0e988895a899cae315dc730a152bae91ae2

11 years agoClean step for libc.
Ying Wang [Wed, 5 Sep 2012 22:58:29 +0000 (15:58 -0700)]
Clean step for libc.

Change-Id: I6e11464eedea7ce073a3278e07825f777a32f62a

11 years agoMerge "fix possible build break" into jb-mr1-dev
Doug Zongker [Tue, 4 Sep 2012 21:48:46 +0000 (14:48 -0700)]
Merge "fix possible build break" into jb-mr1-dev

11 years agofix possible build break
Doug Zongker [Tue, 4 Sep 2012 21:45:11 +0000 (14:45 -0700)]
fix possible build break

If you try to build a recovery image without having built the main
system, creating the recovery resourc file can fail due to the
directory not existing.

Change-Id: I2daff847c0b58dfa519d0f742636f01dba28c689

11 years agoam d65bb799: am 86ffa1cd: am 5da7ec4f: Merge "Follow symlinks in findleaves"
Conley Owens [Tue, 4 Sep 2012 18:08:16 +0000 (11:08 -0700)]
am d65bb799: am 86ffa1cd: am 5da7ec4f: Merge "Follow symlinks in findleaves"

* commit 'd65bb799ab31699067fd3b61b106a067575b154f':
  Follow symlinks in findleaves

11 years agoam 86ffa1cd: am 5da7ec4f: Merge "Follow symlinks in findleaves"
Conley Owens [Tue, 4 Sep 2012 17:31:46 +0000 (10:31 -0700)]
am 86ffa1cd: am 5da7ec4f: Merge "Follow symlinks in findleaves"

* commit '86ffa1cd63ede2c8b923d124aca9adab5aaca260':
  Follow symlinks in findleaves

11 years agoam 5da7ec4f: Merge "Follow symlinks in findleaves"
Conley Owens [Tue, 4 Sep 2012 17:29:43 +0000 (10:29 -0700)]
am 5da7ec4f: Merge "Follow symlinks in findleaves"

* commit '5da7ec4fbdc8c2ac30f7dafb33327e9bfa337d5b':
  Follow symlinks in findleaves

11 years agoMerge "Follow symlinks in findleaves"
Conley Owens [Tue, 4 Sep 2012 17:24:54 +0000 (10:24 -0700)]
Merge "Follow symlinks in findleaves"

11 years agoMerge "add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build" into...
Keun young Park [Sat, 1 Sep 2012 03:07:29 +0000 (20:07 -0700)]
Merge "add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build" into jb-mr1-dev

11 years agoJZO54D
The Android Automerger [Fri, 31 Aug 2012 20:54:56 +0000 (13:54 -0700)]
JZO54D

11 years agoMerge "Add basic Dreams set to builds." into jb-mr1-dev
Daniel Sandler [Fri, 31 Aug 2012 20:34:37 +0000 (13:34 -0700)]
Merge "Add basic Dreams set to builds." into jb-mr1-dev

11 years agoAdd basic Dreams set to builds.
Daniel Sandler [Fri, 31 Aug 2012 12:22:22 +0000 (08:22 -0400)]
Add basic Dreams set to builds.

Change-Id: I7b7e84a84f9fc6c594662baf4dd991ff9af5f162

11 years agoadd libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build
Keun young Park [Fri, 31 Aug 2012 17:00:53 +0000 (10:00 -0700)]
add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build

- the library is dlopened from libsurfaceflinger
Bug: 7089510

Change-Id: I5526c0390efd161e596b08c0bf823090b3969dfe

11 years agoJZO54C
The Android Automerger [Thu, 30 Aug 2012 23:00:32 +0000 (16:00 -0700)]
JZO54C

11 years agoAdd LOCAL_DONT_DELETE_JAR_META_INF
Ying Wang [Thu, 30 Aug 2012 19:59:42 +0000 (12:59 -0700)]
Add LOCAL_DONT_DELETE_JAR_META_INF

To support to not delete META_INF directory from the static Java
libraries.

Change-Id: I720bfa059c43dd457a74a0c60bb6797aa408ecaf

11 years agoam a4f2f34a: am d6a46969: Add make_ext4fs to all builds
Kenny Root [Thu, 30 Aug 2012 19:13:56 +0000 (12:13 -0700)]
am a4f2f34a: am d6a46969: Add make_ext4fs to all builds

* commit 'a4f2f34a45a35c5c49308d336b822ea4af4a543d':
  Add make_ext4fs to all builds

11 years agoAdd make_ext4fs to all builds
Kenny Root [Thu, 9 Aug 2012 19:20:16 +0000 (12:20 -0700)]
Add make_ext4fs to all builds

make_ext4fs is needed for all builds because ASEC containers use it now.
Any product not having this will not be able to create an ASEC
container.

(cherry-pick of 720479ea7e6307648c56f61d82ac12d65f218dda)

Bug: 6960586
Change-Id: I6864ce339a3593c5043e6a55b5af118b3169cc01

11 years agoam d6a46969: Add make_ext4fs to all builds
Kenny Root [Thu, 30 Aug 2012 19:11:40 +0000 (12:11 -0700)]
am d6a46969: Add make_ext4fs to all builds

* commit 'd6a469693fe77884bc902d6ec8be6f04d7d8e21a':
  Add make_ext4fs to all builds

11 years agoJZO54B
The Android Automerger [Thu, 30 Aug 2012 19:07:12 +0000 (12:07 -0700)]
JZO54B

11 years agoam 9993b126: am bb369a58: Merge "Add make_ext4fs to support installing apps to SD...
Jean-Baptiste Queru [Thu, 30 Aug 2012 18:44:17 +0000 (11:44 -0700)]
am 9993b126: am bb369a58: Merge "Add make_ext4fs to support installing apps to SD card"

* commit '9993b1265ec108957c1b4a35bdc62940a350b3e4':
  Add make_ext4fs to support installing apps to SD card

11 years agoam bb369a58: Merge "Add make_ext4fs to support installing apps to SD card"
Jean-Baptiste Queru [Thu, 30 Aug 2012 18:40:13 +0000 (11:40 -0700)]
am bb369a58: Merge "Add make_ext4fs to support installing apps to SD card"

* commit 'bb369a582b9756347959f6ef389507455f805df1':
  Add make_ext4fs to support installing apps to SD card

11 years agoMerge "Add make_ext4fs to support installing apps to SD card"
Jean-Baptiste Queru [Thu, 30 Aug 2012 18:01:29 +0000 (11:01 -0700)]
Merge "Add make_ext4fs to support installing apps to SD card"

11 years agoAdd make_ext4fs to support installing apps to SD card
Jun Tian [Thu, 30 Aug 2012 02:59:17 +0000 (10:59 +0800)]
Add make_ext4fs to support installing apps to SD card

The default createSecureContainer format is changed from fat32 to ext4 in PackageHelper::CreateSdDir in:
/frameworks/base/core/java/com/android/internal/content/PackageHelper.java
We need to add make_ext4fs into the system image to support installing apps to SD card.
In kernel, we also need to add ext4 filesystem support.

Change-Id: If4817a95663144a6bfaeeed0c7cb081063a0daad
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
Signed-off-by: Liang Chen <liang.l.chen@intel.com>
Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
11 years agoAdd make_ext4fs to all builds
Kenny Root [Thu, 9 Aug 2012 19:20:16 +0000 (12:20 -0700)]
Add make_ext4fs to all builds

make_ext4fs is needed for all builds because ASEC containers use it now.
Any product not having this will not be able to create an ASEC
container.

(cherry-pick of 720479ea7e6307648c56f61d82ac12d65f218dda)

Bug: 6960586
Change-Id: I6864ce339a3593c5043e6a55b5af118b3169cc01

11 years agoJRO03V
The Android Automerger [Wed, 29 Aug 2012 21:30:05 +0000 (14:30 -0700)]
JRO03V

11 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 29 Aug 2012 21:29:50 +0000 (14:29 -0700)]
merge in jb-release history after reset to jb-dev

11 years agoJRO03V
The Android Automerger [Wed, 29 Aug 2012 19:43:26 +0000 (12:43 -0700)]
JRO03V

11 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 29 Aug 2012 19:43:01 +0000 (12:43 -0700)]
merge in jb-release history after reset to jb-dev

11 years agoam 4dc6ed96: am 9eb87b8d: Merge "Add pattern to check for GCC 4.6"
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:41:09 +0000 (13:41 -0700)]
am 4dc6ed96: am 9eb87b8d: Merge "Add pattern to check for GCC 4.6"

* commit '4dc6ed96a0612d4693cca5ed5674873754bcb37e':
  Add pattern to check for GCC 4.6

11 years agoam fe95bc0f: am 1d0f5f91: Merge "Include all standard shared library paths in /system...
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:41:08 +0000 (13:41 -0700)]
am fe95bc0f: am 1d0f5f91: Merge "Include all standard shared library paths in /system/lib"

* commit 'fe95bc0fd6bf5c45e264740654ee4ad45fcb37d4':
  Include all standard shared library paths in /system/lib

11 years agoresolved conflicts for merge of 5c903372 to jb-mr1-dev
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:40:19 +0000 (13:40 -0700)]
resolved conflicts for merge of 5c903372 to jb-mr1-dev

Change-Id: I4994c77a6570ce654915bfb8c5f6ee4583db86b7

11 years agoam 9eb87b8d: Merge "Add pattern to check for GCC 4.6"
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:16:59 +0000 (13:16 -0700)]
am 9eb87b8d: Merge "Add pattern to check for GCC 4.6"

* commit '9eb87b8d2011e65462ea42de6899158cd35a492a':
  Add pattern to check for GCC 4.6

11 years agoam 1d0f5f91: Merge "Include all standard shared library paths in /system/lib"
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:16:58 +0000 (13:16 -0700)]
am 1d0f5f91: Merge "Include all standard shared library paths in /system/lib"

* commit '1d0f5f914ae1406b976f69c265f0042c0279974e':
  Include all standard shared library paths in /system/lib

11 years agoam 9e2b4718: Merge "Use gold linker on x86"
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:16:57 +0000 (13:16 -0700)]
am 9e2b4718: Merge "Use gold linker on x86"

* commit '9e2b4718a0e11a723904ba205a5156bae450be30':
  Use gold linker on x86

11 years agoMerge "Add pattern to check for GCC 4.6"
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:47:34 +0000 (12:47 -0700)]
Merge "Add pattern to check for GCC 4.6"

11 years agoMerge "Include all standard shared library paths in /system/lib"
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:46:43 +0000 (12:46 -0700)]
Merge "Include all standard shared library paths in /system/lib"

11 years agoAllow Java resource in apk.
Ying Wang [Tue, 31 Jul 2012 16:40:00 +0000 (09:40 -0700)]
Allow Java resource in apk.

Bug: 6892294
Change-Id: Ib7664e3d9e396dc8ccccecbae9103884014f3ddd

11 years agoMerge "Use gold linker on x86"
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:27:20 +0000 (12:27 -0700)]
Merge "Use gold linker on x86"

11 years agoMerge "Include stock Dreams in the build." into jb-mr1-dev
Chris Wren [Tue, 28 Aug 2012 14:09:44 +0000 (07:09 -0700)]
Merge "Include stock Dreams in the build." into jb-mr1-dev