Commit graph

59 commits

Author SHA1 Message Date
Yohann Roussel
06fe5d1aef Stubs of android-support-multidex-instrumentation.
For the SDK.

(cherry picked from commit 584f601910)

Change-Id: I64b7d279a575c201c4df52a6bd3caa75baf58d11
2014-07-16 12:45:13 +02:00
Yohann Roussel
10713dcece Generates SDK stubs of android-support-multidex
(cherry picked from commit c4441b8c37)

Conflicts:
        core/pathmap.mk

Change-Id: I9283e793d8cdbd4003b86fd33ff62dd35c663f1f
2014-07-16 12:43:36 +02:00
Tim Murray
f6752d303f Add new rs directory to list of Java subdirs of fw/base.
Change-Id: I3213a314e7700162e781526c0450678495442759
2014-01-31 12:32:42 -08:00
Elliott Hughes
2f8dcdd961 Remove libthread_db from the default include path.
This should never have been on the default include path.

The NDK statically links its own libthread_db, so I'm removing
bionic's unused copy from devices.

Bug: 11882807
Change-Id: I49a67fe0902cc4bc178360f6c993959774d74e3a
2014-01-27 15:45:17 -08:00
Scott Main
3938f3e1af am 7cba6168: am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '7cba6168c3cf7681e6200f78bfbf8deacc2f735c':
  Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-12 12:17:26 -07:00
Scott Main
27597c4d8e Revert "remove renderscript support lib from javadocs"
... put support lib javadocs for renderscript back in.

This reverts commit 5b743677eb.

Change-Id: Ia093b04e79ed35d18d9ced7b827a0b06ec4439c1
2013-09-12 18:45:05 +00:00
Scott Main
c3faf216a4 am c5b665ad: am 0ce71df0: Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev
* commit 'c5b665addf7f6a6ca7225b8f75bf419ada2ce74c':
  remove renderscript support lib from javadocs
2013-07-24 16:27:49 -07:00
Scott Main
5b743677eb remove renderscript support lib from javadocs
Change-Id: I6b06bdcdae79442dbf471816cd1cf6f90873f1b2
2013-07-23 21:00:50 -07:00
Jeff Brown
ae859f9b64 Split framework jar.
Change-Id: I38c68ac169a4ea10e4640b5d8e24298a6caaf441
2013-07-17 21:08:18 -07:00
Jeff Brown
85fe0c5446 am 9d80f708: am a3d60ae8: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
* commit '9d80f7085707abd8f088c4f0c4d66cd666a6feb0':
  Revert "Remove mediarouter v7 support library from SDK."
2013-07-11 10:17:00 -07:00
Jeff Brown
9977ddf0cd Revert "Remove mediarouter v7 support library from SDK."
This reverts commit 0eacd936b7.

Bug: 9425325
Change-Id: Idf81e6721fb4361a38ffd73d39c574c2cb2b1155
2013-07-09 00:35:00 +00:00
Jeff Brown
c39063df9b am bd1c3a21: am 0eacd936: Remove mediarouter v7 support library from SDK.
* commit 'bd1c3a2112d023e9f0aab115c64ba345c666ebe5':
  Remove mediarouter v7 support library from SDK.
2013-06-14 16:43:23 -07:00
Jeff Brown
0eacd936b7 Remove mediarouter v7 support library from SDK.
Bug: 9425325
Change-Id: Iba64455cf8bcf4892ff9bf10628e7b5272787a1e
2013-06-14 15:46:29 -07:00
Stephen Hines
1e18897689 am 6c380fe5: am 1dd9f19e: Merge "add renderscript to support library javadocs" into jb-mr2-dev
* commit '6c380fe5da492c526f81c894a069e63ab62613de':
  add renderscript to support library javadocs
2013-05-30 15:34:00 -07:00
Scott Main
af44e90b19 add renderscript to support library javadocs
Bug: 9188088

Change-Id: I7c34a99b73dc01c78174e5b93e5a5d3085ff81ff
2013-05-29 18:42:54 +00:00
Mike Lockwood
fe1a83cbc0 Remove obsolete OMA-DRM support
Change-Id: Ie460730f3ec42e2208e4df685250f7b95a77b4c7
2013-04-29 16:11:00 -07:00
Jeff Brown
fcf2a11387 Add v7 support libs to path map.
This is necessary to ensure that we correctly generate
documentation for these packages.

Bug: 8175766
Change-Id: Ia1c359c744d68f9b9423fd0e9df5516890792936
2013-04-26 00:20:17 -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
Ying Wang
9b93f37c89 Delete icu4j from pathmap.mk
frameworks/base/icu4j is gone in jb-mr2-dev.

Change-Id: I078c8ac3db85598a9b30f8220f251eb7631151e0
2013-03-22 12:32:50 -07:00
Simon Wilson
9e6f863b02 Merge "Add audio-route to pathmap.mk" 2013-01-29 20:03:59 +00:00
Wink Saville
554a0adfb7 Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip
Add voip-common to various files so that its available when booting
and building. Basically everyplace telephony and mms-common where needed
voip-common was added.

In core/pathmap.mk voip is removed as it is no longer in frameworks/base.

Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
2013-01-28 15:30:58 -08:00
Simon Wilson
3b7d7b4664 Add audio-route to pathmap.mk
Change-Id: Id72a839c188fdc93a6a10f53033f09aded23782e
2013-01-16 17:35:27 -08:00
Zhihai Xu
3849760809 ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
remove system/bluetooth stuff.

bug 6849488
Change-Id: I8eb85c6da0aa34aefda2916f2c74e5eae51da27e
2012-09-20 10:50:56 -07:00
Elliott Hughes
89898dff4e Track libnativehelper move for PDK.
Bug: 6369821
Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160
2012-05-04 15:36:42 -07:00
Eino-Ville Talvala
11d3c4421f Add new camera system include path to pathmap.
Change-Id: Ia4200dbffa90397a8a48d00139647c45646af734
2012-04-05 17:09:18 -07:00
Marius Renn
e455a972be Merge "Multi-Project Commit: Move of filterfw out of system/media (3 of 7)" 2012-03-27 16:29:47 -07:00
Marius Renn
fe97fe9e9f Multi-Project Commit: Move of filterfw out of system/media (3 of 7)
This is part of the multi-project commit to move the filter-framework
from system/media/mca to frameworks/base/media/mca.

Note that the filter-framework will soon be replaced with a refactored
version currently under API review (also to go under frameworks/base).
This move is done now to unblock the PDK efforts.

Change-Id: I3d12882239e0bb66e11d3fb5ec952cc474be4f0a
2012-03-27 10:46:13 -07:00
Glenn Kasten
d905491b09 mv wilhelm
Change-Id: I3c1573a3dcb0567cf330fe06b3ae70b3b8f66978
2012-03-26 17:50:44 -07:00
Glenn Kasten
fefc17ff59 Use pathmap.mk for system/media includes
Currently these point to the old location.
Another CL will move them to the new location.

Change-Id: I61dd732981a9a7a3f4a2c1cc01dc072f4fb6a2b8
2012-03-14 15:30:37 -07:00
Mathias Agopian
fb956ef9cc update include paths to new location
Change-Id: I13dfa74f35ee778615cdb9459fc2e18bc37d62a1
2012-03-05 18:45:37 -08:00
Mathias Agopian
bd118e684d add frameworks/native include paths
Change-Id: I1ede8075dc77f77f5a9bc4a53663d4a74842ab36
2012-03-05 16:04:31 -08:00
Mathias Agopian
cdcea7a83d add a name for opengl tests include paths
Change-Id: I4fd30376bcc9549da9391cde99b884eab305d5dd
2012-03-05 16:01:41 -08:00
Svetoslav Ganov
155d855cee Add the support libraries to the platform documentation (build).
Added path to the support libraries.

bug: 5629339

Change-Id: Id414597046c528617313881ea857134512d1c2ba
2011-11-17 15:13:56 -08:00
Ying Wang
c0a177c8ec Remove vpn from FRAMEWORKS_BASE_SUBDIRS
To eliminate build warning.
Reference commit: 44e27b5c74b5f441973561a4f945cb58e0cc45a4
which removed framework/base/vpn.

Change-Id: I539e4bc2a4008c8b9eed74dd53eec1f55db3abe5
2011-07-05 15:37:22 -07:00
Eric Laurent
99acb9c261 created speex resampler library
Change-Id: I4424cb40416d94ccf4637fbbb53f02d595c31e3d
2011-06-17 14:21:17 -07:00
Jean-Baptiste Queru
f4a956bfb6 am 4a6e7d7c: am 43d406e5: Merge "add drm/ directory to include it as part of frameworks"
Merge commit '4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f'

* commit '4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f':
  add drm/ directory to include it as part of frameworks
2010-08-16 15:18:51 -07:00
Jean-Baptiste Queru
4a6e7d7c49 am 43d406e5: Merge "add drm/ directory to include it as part of frameworks"
Merge commit '43d406e5c633af505de0e05e44fda9cfe781c184' into gingerbread-plus-aosp

* commit '43d406e5c633af505de0e05e44fda9cfe781c184':
  add drm/ directory to include it as part of frameworks
2010-08-16 08:15:24 -07:00
Chung-yih Wang
2d9798cf88 resolved conflicts for merge of 9b7ebf5d to master
Change-Id: I0dfbc70b4b52a69ba43f14def4203ece8d9c9090
2010-08-06 10:48:53 +08:00
Chung-yih Wang
ab8ed58c63 Add voip(SIP related codes) into framework.
Change-Id: I12bbeb3dacd51b0234872529479e61bdd8536629
2010-08-05 11:31:07 +08:00
aimitakeshi
2bdf2653dc add drm/ directory to include it as part of frameworks
Change-Id: I62a6ab77587d88ea960f9ece17dcb75726e7e5a9
2010-07-27 08:34:47 +09:00
Nick Kralevich
7ec45cb463 am 876ae91c: am 06df2923: libdrm2 is never used. Remove the reference to it. 2010-05-14 09:36:01 -07:00
Nick Kralevich
06df292347 libdrm2 is never used. Remove the reference to it.
Change-Id: Iee14e336377cedb56adb71bc4f40ded137906f1f
2010-05-13 12:14:12 -07:00
Doug Felt
05d275837c Add subdir under frameworks/base for code ported from icu4j.
Change-Id: I6c9fa6dac1f80bbaf8c80b9e0900f4e628ff596f
2010-04-05 14:00:48 -07:00
Dianne Hackborn
d0c997e0b6 Framework no longer links with android-common. 2010-02-25 10:44:45 -08:00
Dan Egnor
81ab3c593a Include the common source files directly in the framework library
when building, to allow mutual interdependencies; the common static
library will be built independently.
2009-11-18 15:08:30 -08:00
Scott Su
40ea53098c Remove frameworks/base/im from build path 2009-08-23 23:43:24 -07:00
Chung-yih Wang
9305cf95a8 am 67647752: Add keystore in the pathmap of frameworks base.
Merge commit '676477525bc40f7ccf196a6580480b9d44adabd8'

* commit '676477525bc40f7ccf196a6580480b9d44adabd8':
  Add keystore in the pathmap of frameworks base.
2009-06-12 08:25:39 -07:00
Jean-Michel Trivi
7e09fc130c am 4175bb90: Removing "tts" from the list of directories containing source code under frameworks/base. This directory doesn\'t exist anymore after change 3730 which moved the TTS code to frameworks/base/packages/TtsService/.
Merge commit '4175bb90ae8e454416a956b3885995e59ac0454e'

* commit '4175bb90ae8e454416a956b3885995e59ac0454e':
  Removing "tts" from the list of directories containing source code
2009-06-12 04:59:35 -07:00
Chung-yih Wang
676477525b Add keystore in the pathmap of frameworks base. 2009-06-12 07:10:26 +08:00
Jean-Michel Trivi
4175bb90ae Removing "tts" from the list of directories containing source code
under frameworks/base. This directory doesn't exist anymore after
change 3730 which moved the TTS code to frameworks/base/packages/TtsService/.
2009-06-11 10:16:52 -07:00