Commit Graph

9901 Commits

Author SHA1 Message Date
Scott Main b050ed294a 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
2012-09-11 14:44:07 -07:00
Scott Main 5f4e1ac6ee 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
2012-09-11 14:42:43 -07:00
Scott Main ee7cb4637d Merge "add 'small' style for long headings in Training courses" into jb-dev 2012-09-11 14:41:28 -07:00
Scott Main 6b2dc27c08 add 'small' style for long headings in Training courses
Change-Id: I385df22d12ad419ad6883c0e94d3053e7e520a09
2012-09-11 14:27:34 -07:00
Ying Wang aadbb3d3b2 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.
2012-09-11 12:16:46 -07:00
Ying Wang 930d2b5c3f 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.
2012-09-11 12:14:34 -07:00
Ying Wang 6a6723a0a9 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.
2012-09-11 12:12:23 -07:00
Ying Wang 4458452ef6 Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES." 2012-09-11 11:49:11 -07:00
Ying Wang 6adcf0180a android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
2012-09-11 11:47:22 -07:00
The Android Automerger a33e3b8390 JGO73 2012-09-11 09:54:42 -07:00
The Android Automerger 96051afe4a merge in jb-nakasig-release history after reset to jb-dev 2012-09-11 09:54:29 -07:00
The Android Automerger e859020df0 JZO54F 2012-09-10 15:11:04 -07:00
Ying Wang 5586106944 am 4595d7d6: am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args"
* commit '4595d7d62c0d594aa3501e4f547563348a3a5eb0':
  Add transform-d-to-p-args
2012-09-10 10:25:41 -07:00
Ying Wang 4595d7d62c am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args"
* commit '410420ed667f869e15df0d3204834282984d4f6a':
  Add transform-d-to-p-args
2012-09-10 10:23:29 -07:00
Ying Wang 410420ed66 am 9efa5bae: Merge "Add transform-d-to-p-args"
* commit '9efa5bae8645988a0d24af14142df9572bf7bd57':
  Add transform-d-to-p-args
2012-09-10 10:21:57 -07:00
Ying Wang 9efa5bae86 Merge "Add transform-d-to-p-args" 2012-09-10 09:48:26 -07:00
The Android Automerger 987332e561 JGO72 2012-09-10 08:09:13 -07:00
The Android Automerger 627a73680e merge in jb-nakasig-release history after reset to jb-dev 2012-09-10 08:09:11 -07:00
The Android Automerger d86c56d29f JGO71 2012-09-09 08:09:10 -07:00
The Android Automerger 0c7a9ba323 merge in jb-nakasig-release history after reset to jb-dev 2012-09-09 08:09:06 -07:00
The Android Automerger 95b1b4560b JGO70 2012-09-08 08:09:14 -07:00
The Android Automerger 13ccbda2a2 merge in jb-nakasig-release history after reset to jb-dev 2012-09-08 08:09:05 -07:00
Ying Wang c23f4efdbb 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
2012-09-07 17:04:06 -07:00
Scott Main 243b0dc136 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
2012-09-07 16:19:11 -07:00
Scott Main 65cdbdcdf0 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
2012-09-07 16:17:11 -07:00
Scott Main 65511c0a72 fix script bug. we were running some scripts that are only used in the reference
Change-Id: I0693a7a7af5e41283942b387e53a254903b83427
2012-09-07 15:51:32 -07:00
The Android Open Source Project b2c31c3ec8 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
2012-09-07 15:22:29 -07:00
The Android Open Source Project a7b0ec3c48 Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge
Change-Id: Ibb66fb1e9c4c3066c8a27139922300a511ff9e7b
2012-09-07 15:20:58 -07:00
The Android Automerger 783924163e JRO03W 2012-09-07 10:29:09 -07:00
The Android Automerger 0527b10bc2 JRO69 2012-09-07 10:28:17 -07:00
The Android Automerger 26acee7edb merge in jb-release history after reset to jb-dev 2012-09-07 10:28:12 -07:00
The Android Automerger 16dfdcc0c1 JGO69 2012-09-07 08:09:06 -07:00
The Android Automerger 6b40d9dd7a merge in jb-nakasig-release history after reset to jb-dev 2012-09-07 08:09:00 -07:00
The Android Automerger 248961ca4e JGO68 2012-09-06 15:09:18 -07:00
The Android Automerger cba5291918 merge in jb-nakasig-release history after reset to jb-dev 2012-09-06 15:09:17 -07:00
The Android Automerger 2686236196 JGO67 2012-09-06 15:08:50 -07:00
The Android Automerger dbf1b57d3f JZO54E 2012-09-06 13:30:11 -07:00
Ying Wang 86eab59783 am b4199b86: am 1c27ac0e: am 1b70bb21: Merge "Clean step for libc."
* commit 'b4199b869bcc3b8dff6572c682fe09f74660268e':
  Clean step for libc.
2012-09-06 10:44:12 -07:00
Ying Wang b4199b869b am 1c27ac0e: am 1b70bb21: Merge "Clean step for libc."
* commit '1c27ac0ea9d2e43d8ff05c61aa4fe6f3d9558334':
  Clean step for libc.
2012-09-06 10:43:07 -07:00
Ying Wang 1c27ac0ea9 am 1b70bb21: Merge "Clean step for libc."
* commit '1b70bb2162d74a304bd0d00674a0fed80f936961':
  Clean step for libc.
2012-09-06 10:40:43 -07:00
Ying Wang 1b70bb2162 Merge "Clean step for libc." 2012-09-06 10:36:31 -07:00
Ying Wang 7d862475fd Clean step for libc.
(cherry-pick of ab1e93d4d4f4a46fa922df5ba7ccd41dde1221ac.)

Change-Id: I304312d6eb0346c050d02bd834565e0d43d8b4dd
2012-09-06 10:34:37 -07:00
Ying Wang 63c3871502 Clean up the crt*.o files.
To fix incremental build failure caused by
https://android-review.googlesource.com/41940

Change-Id: I9a977fe6e26fefaababdbb5d498b63e37884a4be
2012-09-06 10:34:07 -07:00
The Android Open Source Project 4c3e2810b7 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
2012-09-06 09:11:29 -07:00
The Android Open Source Project 11f2612325 Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: I788e28f1f2a2d2a41c5c49097da31417b476cfcb
2012-09-06 08:08:09 -07:00
Ying Wang 7676611415 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
2012-09-05 18:39:55 -07:00
Ying Wang 19c06156b6 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
2012-09-05 18:37:46 -07:00
Ying Wang 0ee362ea04 am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
* commit '478d0fc6a311b236fddc9d18c9a1b922f8ecf1ea':
  Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
2012-09-05 18:35:50 -07:00
Ying Wang 478d0fc6a3 Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES" 2012-09-05 18:15:12 -07:00
Ying Wang 619fccf9f3 Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
Before setting up the rules.

Change-Id: Ifedbc0e988895a899cae315dc730a152bae91ae2
2012-09-05 18:09:49 -07:00