Commit Graph

83 Commits

Author SHA1 Message Date
Yohann Roussel c324a62425 Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
This keeps only the real sources in doc target and fixes some error
messages caused by trying to generate docs of the tests.

(cherry picked from commit 100aba5374)

Change-Id: I39f3ede95ae68777ca5e3db4ab5c6ebeefc86ac6
2014-07-23 16:07:20 +02:00
Jeff Brown 5d0da1f959 Build docs for android-support-media-protocols.jar.
Change-Id: Ib98b1cf3c4ab04594788f5182e616987a64b55be
2014-07-14 04:08:15 -07:00
Santos Cordon 7d36e1574f Add phone directory to frameworks/base.
Necessary to support the change: Id8b08d88a06a7b4e90a4a7f702ba56526e108ca5

Change-Id: I1a00d2cdcb26fa796c5d0840cfe16b0e416ad299
2014-07-02 18:05:25 +00:00
Xavier Ducrohet e87fcf5e16 Revert "Add missing support lib to list."
This reverts commit b3ae5354c3.
2014-06-17 17:25:18 -07:00
Xavier Ducrohet b3ae5354c3 Add missing support lib to list.
Change-Id: I6f3f1d1526db9bd76a35a612bc44918deee3e305
2014-06-17 12:12:50 -07:00
Santos Cordon cb17dc43e5 am 6440470b: Adding telecomm to build src path for framework.
* commit '6440470b5ed748cf1c30ecbda7877d08b7a778f4':
  Adding telecomm to build src path for framework.
2014-05-12 23:25:27 +00:00
Marco Nelissen 863c9e9cf5 Add libmediandk
Change-Id: I2c9645d16b56aafb05b52369b0774adffb575197
2014-04-21 10:26:17 -07:00
Xavier Ducrohet 86c0cf68c8 am c8fea2ae: am 7c629a72: am cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit 'c8fea2ae9859c68e3d48c4e65ada7331daab11f0':
  Add annotation support lib.
2014-03-26 18:23:15 +00:00
Xavier Ducrohet c8fea2ae98 am 7c629a72: am cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit '7c629a728f628278986498060e649727cf5025fa':
  Add annotation support lib.
2014-03-26 18:17:08 +00:00
Xavier Ducrohet 7c629a728f am cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit 'cc85124393c438986e6639bc90906edf2dc2ca7a':
  Add annotation support lib.
2014-03-26 18:10:46 +00:00
Xavier Ducrohet ef04682fdf Add annotation support lib.
Change-Id: I5a4ddbdf09a09db944e16ed6baab604aa1710974
2014-03-26 10:50:38 -07:00
Tim Kilbourn 772af0c643 am d5c004b3: am 2389da57: am 8acc8da4: Add v17/leanback to pathmap.
* commit 'd5c004b39483bcd599d03098e7d3bd8af88b23a1':
  Add v17/leanback to pathmap.
2014-03-19 09:42:20 +00:00
Tim Kilbourn 2389da5787 am 8acc8da4: Add v17/leanback to pathmap.
* commit '8acc8da42d1971792090f3b80b1900427e5d37fc':
  Add v17/leanback to pathmap.
2014-03-19 09:23:43 +00:00
Tim Kilbourn 8acc8da42d Add v17/leanback to pathmap.
Change-Id: I3032710da8cf8714516bf78f0971223257dfe1ec
2014-03-18 15:20:15 -07:00
Derek Sollenberger aa42672165 Remove global Skia includes and associated shortcuts.
bug:13225538
Change-Id: I7deff74f5c0cd7b6ad0e120ffbc378c5eb8d75ee
2014-02-27 14:43:13 -05:00
Santos Cordon 6440470b5e Adding telecomm to build src path for framework.
Change-Id: I36a7df9ed30c949241cc19dd67994883db68394f
2014-02-20 14:14:55 -08:00
Tim Murray 47f9b9bc29 am 5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base."
* commit '5352018b0b115061bce7a2aac14780ffea3885c7':
  Add new rs directory to list of Java subdirs of fw/base.
2014-02-03 22:44:31 +00: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 d63d974c49 am 6fe9a949: am 69c36ee7: am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '6fe9a94989879babb859a24fdef0b2553955cc53':
  Remove libthread_db from the default include path.
2014-01-28 01:04:55 +00:00
Elliott Hughes 6fe9a94989 am 69c36ee7: am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '69c36ee7a8c1e3d8c7ca04d61f75d95585c58253':
  Remove libthread_db from the default include path.
2014-01-28 00:59:15 +00: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
Chet Haase c888b4f9b6 am 585ce19d: Add recyclerview to support libs docs
* commit '585ce19d9d6b9feac75baa646b507dbd35085f7c':
  Add recyclerview to support libs docs
2014-01-16 17:55:15 +00:00
Chet Haase 585ce19d9d Add recyclerview to support libs docs
Change-Id: Ibe863e4b1930670353e6e0658fbc83e694dec3a4
2014-01-16 15:55:56 +00:00
Tim Murray 5544519444 Add new rs directory to list of Java subdirs of fw/base.
Change-Id: I3213a314e7700162e781526c0450678495442759
2013-12-17 13:30:08 -08:00
Maurice Chu 664035f771 Move multidex support library
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

GMS Core will be using the multidex library and has gotten special
approval to use the unreleased multidex library (i.e., guinea pig).

Bug: 10674263
Change-Id: I31f582dd7adf4db6eb19c52357875594fc9f7829
2013-11-08 00:09:14 +01:00
Scott Main 1a2709f05f add renderscript to the support lib javadocs
this is a round-about change to handle conflict from Ia093b04e79ed35d18d9ced7b827a0b06ec4439c1

Change-Id: Iac5f91e52c1a962abb26864bac9343657a8cf9b6
2013-09-12 16:47:05 -07: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
Yohann Roussel 584f601910 Stubs of android-support-multidex-instrumentation.
For the SDK.

Change-Id: I54bee4d89d7c291933673c3b5bf7f2b85f904377
2013-09-05 14:31:31 +02:00
Yohann Roussel c4441b8c37 Generates SDK stubs of android-support-multidex
Change-Id: I9283e793d8cdbd4003b86fd33ff62dd35c663f1f
2013-08-21 14:19:44 +02: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