The Android Open Source Project
ffd5c73285
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I4d84725585d8d949477a1c5e398faf4828c0d3e0
2012-11-05 07:55:49 -08:00
The Android Automerger
ff344406ee
JOP34
2012-11-03 11:32:00 -07:00
The Android Automerger
38a8607dd9
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-03 11:31:19 -07:00
Nick Sanders
1a849d4f2e
am 278dbf3c: am 9af26ddd: Merge "Disable factory build under PDK" into jb-mr1-aah-dev
...
* commit '278dbf3c6be3ba3149190823ea1028667059a24d':
Disable factory build under PDK
2012-11-02 18:51:39 -07:00
Nick Sanders
278dbf3c6b
am 9af26ddd: Merge "Disable factory build under PDK" into jb-mr1-aah-dev
...
* commit '9af26dddb39e5d87c8a455eb462eb3039e45ad69':
Disable factory build under PDK
2012-11-02 18:48:59 -07:00
Nick Sanders
9af26dddb3
Merge "Disable factory build under PDK" into jb-mr1-aah-dev
2012-11-02 18:46:45 -07:00
The Android Automerger
fdb9350e9d
JOP33
2012-11-02 17:35:24 -07:00
The Android Automerger
9aca04c75b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-02 17:34:17 -07:00
The Android Automerger
a6d6187841
JOP32C
2012-11-02 14:46:32 -07:00
Nick Sanders
a1712eea02
Disable factory build under PDK
...
Phantasm PDK support doesn't work with the factory build.
It's not needed for eng support so we'll disable it.
Change-Id: I9b65cdbb20bbcff601600d6b0cac7cc98f6f614c
Signed-off-by: Nick Sanders <nsanders@google.com>
2012-11-02 12:55:56 -07:00
Ying Wang
3d5f399d87
Merge "NOTICE file only module"
2012-11-02 09:27:11 -07:00
The Android Open Source Project
04b890de5a
am 3b90b086: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '3b90b0868fb7d71c893998562be2ba9c455b509d':
JOP32B
JOP32
2012-11-02 07:30:18 -07:00
The Android Open Source Project
3b90b0868f
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I0a15906b6b86c84c785eb57cde0b202a3b0a97cf
2012-11-02 07:27:40 -07:00
The Android Automerger
3618379ed8
JOP32B
2012-11-01 23:43:31 -07:00
The Android Automerger
3de803e46a
JOP32
2012-11-01 19:06:39 -07:00
The Android Automerger
11f0918510
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-01 19:04:59 -07:00
Robert Ly
4f852704bd
am 16204b6a: am 78377bcd: am 5a6e2407: am 0900e42e: am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs
...
* commit '16204b6af7303fcaffb5caa9b7fa4be4587743c4':
add css animation videos
2012-11-01 17:40:38 -07:00
Robert Ly
16204b6af7
am 78377bcd: am 5a6e2407: am 0900e42e: am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs
...
* commit '78377bcd1a08d99e446dc7f1e1b886c624dd3148':
add css animation videos
2012-11-01 17:39:11 -07:00
Robert Ly
78377bcd1a
am 5a6e2407: am 0900e42e: am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs
...
* commit '5a6e24074851fba5fb40b4f453d1a18852053ffa':
add css animation videos
2012-11-01 17:36:06 -07:00
Robert Ly
5a6e240748
am 0900e42e: am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs
...
* commit '0900e42e488eec40dd40c6e82a9823ca338b11b5':
add css animation videos
2012-11-01 17:33:03 -07:00
Robert Ly
0900e42e48
am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs
...
* commit '12e6b988cbe32fda61957ed87bfb30337c2b8f9d':
add css animation videos
2012-11-01 17:31:20 -07:00
Ying Wang
13d6950ef8
NOTICE file only module
...
To pick up a NOTICE file in LOCAL_PATH and attach it to
/system/lib/libfoo.so, use the following syntax:
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := NOTICE_FILES
LOCAL_INSTALLED_MODULE := $(PRODUCT_OUT)/system/lib/libfoo.so
include $(BUILD_NOTICE_FILE)
Bug: 7460213
Change-Id: Ie692be72deab37be04d1b578578c131a0885a090
2012-11-01 17:29:10 -07:00
Robert Ly
12e6b988cb
am e896e344: Merge "add css animation videos" into jb-dev-docs
...
* commit 'e896e3447145859371d2b7172122faabe44d10e2':
add css animation videos
2012-11-01 17:28:28 -07:00
Robert Ly
e896e34471
Merge "add css animation videos" into jb-dev-docs
2012-11-01 17:26:34 -07:00
Robert Ly
d78354d35b
add css animation videos
...
Change-Id: I2e51cfce1af378e03a9ac40be76ab55e61d19f24
2012-11-01 17:13:44 -07:00
Tim Murray
bad8550ccc
Merge "Add support for RS in C++."
2012-11-01 15:32:20 -07:00
Tim Murray
a7aa8005d2
Add support for RS in C++.
...
Change-Id: Ib8008d6301584bd0a2cd91c4c1294e0df8ac3b73
2012-11-01 15:07:27 -07:00
The Android Open Source Project
6487fc1889
am 9f1ba7e6: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '9f1ba7e687e115414f6ef6979b5b355f7b7e21a5':
JOP31
2012-11-01 07:53:06 -07:00
The Android Open Source Project
9f1ba7e687
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Idf71be6e72f974579d6b5fe382f7fe4afd56c7cc
2012-11-01 07:51:40 -07:00
Torne (Richard Coles)
f4bbd8c1e9
Merge "Make the base product depend on webview indirectly."
2012-11-01 04:09:18 -07:00
The Android Automerger
2d0ea5bee3
JOP31
2012-10-31 18:35:54 -07:00
The Android Automerger
6a9426cb14
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-31 18:33:46 -07:00
Ying Wang
1e1a961690
Merge "Move the host tools from target/product/sdk.mk to sdk/build/product_sdk.mk"
2012-10-31 12:22:39 -07:00
Ying Wang
b34115d7db
Merge "Remove nonexistent modules from PRODUCT_PACKAGES"
2012-10-31 11:58:32 -07:00
Ying Wang
92cd50c416
Remove nonexistent modules from PRODUCT_PACKAGES
...
and revert back to fatal error if sdk has nonexistent modules.
Change-Id: Ic7185128b0253b3591592b4167ea1e26cee1aa84
2012-10-31 11:55:53 -07:00
Ying Wang
5be57b2f0d
Move the host tools from target/product/sdk.mk to sdk/build/product_sdk.mk
...
Change-Id: Ic5d1e50701c9b394a59284aa8b094bdc1fb0f96c
2012-10-31 11:25:31 -07:00
Ying Wang
0e50d89123
Add jobb and fat32lib to sdk PORUDCT_PACKAGES.
...
Change-Id: I0fb8bdc67c6b79eb3949a9e2a8de67b8c55c3af5
2012-10-31 11:06:03 -07:00
Torne (Richard Coles)
b23917737f
Make the base product depend on webview indirectly.
...
Instead of depending on libwebcore directly as part of the base product,
depend on the phony "webview" target from frameworks/webview instead, to
allow the Chromium-powered webview to override it.
Change-Id: I2f9c103a57a730b252e8a05d52c5b4c1b9711319
2012-10-31 17:10:36 +00:00
The Android Open Source Project
818bd3b5ff
am 0c958246: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '0c958246b0a4cbb6561740615f173b54e0e47d00': (49 commits)
JOP30C
JOP30B
JOP30
JOP29
JOP26B
JOP26
JOP24G
JOP24F
JOP24E
JOP24D
JOP24C
JOP24B
JVP15S
JOP24
JOP23E
JOP23D
JVP15R
JOP23C
JVP15Q
JOP23B
...
2012-10-31 09:17:38 -07:00
The Android Open Source Project
0c958246b0
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I588ae4c43c605d0a5d9b6a61e90f868b2fd41ea7
2012-10-31 09:15:24 -07:00
The Android Automerger
b3a7adffba
JOP30C
2012-10-30 21:53:41 -07:00
The Android Automerger
773c4ad252
JOP30B
2012-10-30 20:13:08 -07:00
The Android Automerger
0bd5295f0f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-30 20:11:57 -07:00
Ying Wang
62643b76ce
am 5dc158b3: am a281e6a9: Merge "Filter out the overridden packages before doing required module expansion."
...
* commit '5dc158b36329566dbed1fdc36b931f7d5c09f5c1':
Filter out the overridden packages before doing required module expansion.
2012-10-30 10:11:34 -07:00
The Android Automerger
24ffc43235
JOP30
2012-10-30 08:53:55 -07:00
The Android Automerger
d11e0ff637
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-30 08:52:22 -07:00
Ying Wang
5dc158b363
am a281e6a9: Merge "Filter out the overridden packages before doing required module expansion."
...
* commit 'a281e6a9c3e9ee2b38e38014324bf58ae1dff9a2':
Filter out the overridden packages before doing required module expansion.
2012-10-29 17:14:55 -07:00
The Android Automerger
e5eabd42de
JOP29
2012-10-29 11:21:19 -07:00
The Android Automerger
a69ca86e99
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-29 11:19:42 -07:00
Joe Onorato
49597da09a
am c9b12129: am 9a6a326c: Fix broken dependencies with the layers.txt files.
...
* commit 'c9b12129b458a1b28a8d9059fa180db6b83cb2dd':
Fix broken dependencies with the layers.txt files.
2012-10-26 18:21:59 -07:00
