tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9164 commits 1 branch 0 tags 119 MiB
Commit graph

9164 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ying Wang
9b76c054c6 am 0872a010: Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev 
* commit '0872a010659d20633f07f4ef54cf61f8e4b6e030':
  More flexibility to keep/remove R.class in static Java library
 2012-06-19 14:27:31 -07:00
Ying Wang
0872a01065 Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev 2012-06-19 14:25:14 -07:00
Jean-Baptiste Queru
a644e7bb66 am 03bb0851: Remove references to packages that don\'t exist any more. 
* commit '03bb0851d6a86ac51becaa132f96ed1d8f4b604c':
  Remove references to packages that don't exist any more.
 2012-06-19 11:27:26 -07:00
Jean-Baptiste Queru
03bb0851d6 Remove references to packages that don't exist any more. 
Those can't be found anywhere in the build system.

Change-Id: I3b3727e7735de0dbffae930cf99a6d6ccbc79570
 2012-06-19 11:17:27 -07:00
Ying Wang
ae25ec1bcd More flexibility to keep/remove R.class in static Java library 
- Usually you don't need to set LOCAL_JAR_EXCLUDE_FILES in your
  Android.mk, if your static library is directly used by an app.
- If your library will be included by another library that need
  reference the R/Manifest class, you can set
  LOCAL_JAR_EXCLUDE_FILES := none
  to keep the generated classes.
- If your library includes another static library that has Android
  resource and you want to remove the generated classes carried by
  the static library, set:
  LOCAL_JAR_EXCLUDE_FILES := $(ANDROID_RESOURCE_GENERATED_CLASSES)

With the LOCAL_JAR_EXCLUDE_FILES value "none", deprecate the old
long variable LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY.

Change-Id: I3b9ad5d66f0262f784feb09bc1537c5b01256258
 2012-06-19 10:40:37 -07:00
The Android Open Source Project
ef3a532141 Reconcile with jb-release 
Change-Id: Id011e3aaae44e404d9e7b75e5a52f097d2317126
 2012-06-19 07:15:29 -07:00
The Android Automerger
cab8934f9d JRN80 2012-06-19 07:10:41 -07:00
The Android Automerger
36ed5dacdb merge in jb-release history after reset to jb-dev 2012-06-19 06:59:24 -07:00
The Android Open Source Project
e8d1719bd2 Reconcile with jb-release 
Change-Id: I7cea6b7dd25e75e4b0a738cfa890fcaa556c2d0b
 2012-06-19 06:13:10 -07:00
The Android Automerger
2f78c04d78 JRN79C 2012-06-18 16:27:50 -07:00
The Android Automerger
5bd0baa402 JRN79B 2012-06-18 15:54:58 -07:00
Guang Zhu
d214c7e495 am 5d76a3f2: Merge "add uiautomator into system image" into jb-dev 
* commit '5d76a3f2d53fceb883d84d214c28c51bc3e5b43c':
  add uiautomator into system image
 2012-06-18 11:55:49 -07:00
Guang Zhu
5d76a3f2d5 Merge "add uiautomator into system image" into jb-dev 2012-06-18 11:52:42 -07:00
Ying Wang
5112562108 am 43ca4a45: Remove the user tag and legacy prebuilts for the srec modules. 
* commit '43ca4a45a43e2084b5a40af90ff523b0417d31c0':
  Remove the user tag and legacy prebuilts for the srec modules.
 2012-06-18 10:33:33 -07:00
The Android Automerger
7be7b424b8 JRN79 2012-06-18 07:06:59 -07:00
The Android Automerger
34721324a1 merge in jb-release history after reset to jb-dev 2012-06-18 06:59:23 -07:00
The Android Automerger
5b0b2a4ec0 JRN78B 2012-06-17 17:06:48 -07:00
The Android Automerger
87888c7395 JRN78 2012-06-17 07:08:19 -07:00
The Android Automerger
eebf803bf6 merge in jb-release history after reset to jb-dev 2012-06-17 06:59:26 -07:00
Guang Zhu
e770754b9f add uiautomator into system image 
this includes 2 pieces:
* uiautomator shell script
* uiautomator.jar: test runner and the automation framework
  classes

source is under frameworks/testing/uiautomator

Change-Id: I237d85b8917d2451cf35362d2e34786940897921
 2012-06-17 00:33:08 -07:00
The Android Automerger
583216a7dc JRN77 2012-06-16 07:11:00 -07:00
The Android Automerger
1577b15dca merge in jb-release history after reset to jb-dev 2012-06-16 06:59:32 -07:00
Ying Wang
43ca4a45a4 Remove the user tag and legacy prebuilts for the srec modules. 
Change-Id: I20d8ec8986e2da76fbab67d1f86f5d385bd87c47
 2012-06-15 18:36:06 -07:00
The Android Automerger
175026a969 JRN75E 2012-06-15 16:17:07 -07:00
The Android Automerger
fe79d01cad JRN75D 2012-06-15 14:13:01 -07:00
The Android Automerger
ccfa22ebad JRN75C 2012-06-14 16:48:04 -07:00
The Android Automerger
43843b6f58 JRN75B 2012-06-14 13:29:21 -07:00
Jean-Baptiste Queru
ffbef646d2 am 74aba614: Allow additional vendors 
* commit '74aba61404f0c1ea8693d2959d81d8b5b1bdf5d4':
  Allow additional vendors
 2012-06-14 09:24:18 -07:00
Jean-Baptiste Queru
74aba61404 Allow additional vendors 
Bug: 6611375
Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
 2012-06-14 09:15:20 -07:00
The Android Automerger
91f3d748c4 JRN75 2012-06-14 07:09:54 -07:00
The Android Automerger
11b1194cf6 merge in jb-release history after reset to jb-dev 2012-06-14 06:59:24 -07:00
The Android Automerger
291b58d00d JRN74C 2012-06-13 18:43:04 -07:00
Jean-Baptiste Queru
55e8c113af am 3e4732a3: am 08779651: Merge "generic_x86: build using the NDK ABI\'s processor features" 
* commit '3e4732a39f63326d267a1af17184556e3977f582':
  generic_x86: build using the NDK ABI's processor features
 2012-06-13 17:34:28 -07:00
Jean-Baptiste Queru
3e4732a39f am 08779651: Merge "generic_x86: build using the NDK ABI\'s processor features" 
* commit '0877965170498b2dd3a58f9483cf26d6945c9138':
  generic_x86: build using the NDK ABI's processor features
 2012-06-13 17:31:45 -07:00
Jean-Baptiste Queru
0877965170 Merge "generic_x86: build using the NDK ABI's processor features" 2012-06-13 17:17:34 -07:00
The Android Automerger
0445111a01 JRN74B 2012-06-13 16:40:23 -07:00
The Android Automerger
d3acbf293f JRN74 2012-06-13 09:03:15 -07:00
The Android Automerger
e0db94ba82 merge in jb-release history after reset to jb-dev 2012-06-13 08:26:26 -07:00
Jean-Baptiste Queru
6e207824af resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp 
Change-Id: I6c750adcf06457bf8a3b47423c990be6e9d23bbb
 2012-06-13 07:42:04 -07:00
Jean-Baptiste Queru
572d0d7dd3 am 3f8ff030: Merge "x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3" 
* commit '3f8ff030e0c693ca0b1758612ecb571711ec2667':
  x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3
 2012-06-13 07:22:29 -07:00
Jean-Baptiste Queru
3f8ff030e0 Merge "x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3" 2012-06-13 06:25:00 -07:00
Jean-Baptiste Queru
06b1a47fe1 am d3d78a30: am a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries" 
* commit 'd3d78a30a4f8dd40fa055577ea2708ab34606cec':
  gcc 4.6 requires --copy-dt-needed-entries
 2012-06-12 15:52:54 -07:00
Jean-Baptiste Queru
d3d78a30a4 am a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries" 
* commit 'a11ad6c2b3cdf13581c4329679cd3d2952323f6d':
  gcc 4.6 requires --copy-dt-needed-entries
 2012-06-12 15:50:19 -07:00
Jean-Baptiste Queru
a11ad6c2b3 Merge "gcc 4.6 requires --copy-dt-needed-entries" 2012-06-12 15:24:17 -07:00
Jean-Baptiste Queru
12d24b5aab resolved conflicts for merge of 76af0657 to jb-dev-plus-aosp 
Change-Id: I4843695261abbc478fd6b505debe6fc20a06c88d
 2012-06-12 14:57:27 -07:00
Jean-Baptiste Queru
76af0657be am 0c6b27fe: Merge "full_x86: use telephony profile" 
* commit '0c6b27fe83a810c5a91c3aa1a4ffc0348d24b5cd':
  full_x86: use telephony profile
 2012-06-12 14:43:56 -07:00
Jean-Baptiste Queru
0c6b27fe83 Merge "full_x86: use telephony profile" 2012-06-12 14:36:04 -07:00
Bruce Beare
46b48e88fe full_x86: use telephony profile 
Author: Bruce Beare <bruce.j.beare@intel.com>
Change-Id: I3c086f3f38049e9a7cc2e653aa0ee0d2a2ca1a79
 2012-06-12 14:34:53 -07:00
Jamie Gennis
82c11caca0 am f3b1395a: Merge "Add atrace to core.mk" into jb-dev 
* commit 'f3b1395a41a1f882fac74b8a55723af8f77535d0':
  Add atrace to core.mk
 2012-06-12 12:41:26 -07:00
The Android Automerger
11ee14dd10 JRN73 2012-06-12 11:30:36 -07:00