Commit Graph

157 Commits

Author SHA1 Message Date
Igor Murashkin
893289bf25 eclipse classpath: update to include frameworks/ex/camera2
Change-Id: Icd72ae70c2e8297a1a9c27a9a0ecc4d96fee81b3
2013-09-19 17:34:42 -07:00
Igor Murashkin
8ac27eff4e eclipse classpath: add external/hamcrest (used by mockito)
This fixes the "The hierarchy of the type is inconsistent" error
when using ArgumentMatcher from Mockito.

Change-Id: Ic5e74c7f7020a610fdb1c061a7eb3ecb4c487438
2013-08-29 10:51:35 -07:00
Igor Murashkin
dda1626d9e Merge "eclipse classpath: Add TestingCamera2" 2013-07-23 21:25:02 +00:00
Igor Murashkin
eae9330f7b eclipse classpath: Add TestingCamera2
Change-Id: Iee650dd2b76ab958c6ff536a0e72038305709344
2013-07-18 17:33:10 -07:00
Jeff Brown
b32b92da3d Update paths to framework intermediates.
Change-Id: Ic9e54cd14234ee1b03d1fd98b479fc191af10830
2013-07-18 16:30:39 -07:00
Santos Cordon
a4bfa424ee Adding InCallUI and Telephony service directories to classpath.
also fix duplicate libdvm entry which caused an error in eclipse.

Change-Id: I7e843f0f28e1d64af5536dee39cb994b9a188035
2013-07-12 15:05:03 -07:00
Igor Murashkin
d44ae772f1 Add junit to eclipse classpath
Change-Id: I7144c3af4a46cbfaf7d0b477d005ae911b238c7a
2013-06-17 14:37:26 -07:00
Igor Murashkin
70ef9f4978 Update eclipse classpath to include mockito
Change-Id: Id2900952f265ae4b84842f2e8838c5898fca6fe6
2013-06-11 13:26:33 -07:00
Igor Murashkin
d8da72be61 Merge "Update eclipse classpath to include MediaFrameworkTest" 2013-06-03 18:22:03 +00:00
Igor Murashkin
27664479db Update eclipse classpath to include MediaFrameworkTest
Change-Id: Ifc73ba084a4c72f4838cc1059314166e7ae08dc6
2013-05-31 15:07:40 -07:00
Igor Murashkin
af0a72b1fa Merge "update eclipse C++ include paths and updated README for C++ instructions" 2013-05-31 00:03:45 +00:00
Jeff Sharkey
1485d89205 am 0f79198b: am 1cfd5ec3: am 924470b1: Merge "Bring libdvm into default classpath."
* commit '0f79198b69475c8aae6c2ad935380322209c12b2':
  Bring libdvm into default classpath.
2013-05-30 17:02:06 -07:00
Jeff Sharkey
1cfd5ec332 am 924470b1: Merge "Bring libdvm into default classpath."
* commit '924470b1031c7e10a2989bad14eeff0da7e77394':
  Bring libdvm into default classpath.
2013-05-30 16:54:25 -07:00
Igor Murashkin
52bb78b2d7 update eclipse C++ include paths and updated README for C++ instructions
* add 1 more include path needed for frameworks/av to index correctly
* update README.importing-to-eclipse.txt for importing C++ files/symbols/paths

Change-Id: If967e5e9df28267f06e7b7451ba4c266776d58a2
2013-05-30 14:39:28 -07:00
Andy McFadden
58c286f275 Add libcore/libdvm/src/main/java
Change-Id: I427adfdb79434803a5542e45ab1cb97a2d74ea13
2013-05-28 16:42:00 -07:00
Jeff Sharkey
6310a39146 Bring libdvm into default classpath.
Change-Id: Idce0540258bd0827af6404a5d6849ba6f80c198f
2013-05-21 11:01:22 -07:00
Mathias Agopian
29fa33a614 am 47a0ba95: Merge "update include paths and symbols for eclipse" into jb-mr2-dev
* commit '47a0ba955311ad478edc3e5a973b854bb6ad39af':
  update include paths and symbols for eclipse
2013-04-03 17:36:39 -07:00
Mathias Agopian
8ad2a3af80 update include paths and symbols for eclipse
- we define __SIZE_TYPE__ and __PTRDIFF_TYPE__ in symbols
  because for some reason Eclipse barfs on stddef.h otherwise.
  This seems to solve the problem entirely.

- removed symbols for HAVE_xxx because those should come
  from AndroidConfig.h

NOTE: make sure to set

  ${ProjDirPath}/build/core/combo/include/arch/linux-arm/AndroidConfig.h

in Eclipse's "Paths and Symbols" / "Include Files" tab. This tab is
NOT shown by default, it needs to be enabled in the global
preference panel under "C/C++" / "Property Pages Settings".

As far as I can tell this setting is not exportable.

Change-Id: I1aa185b4b3564118cb9da19b2f932b7b37b81167
2013-04-02 16:14:04 -07:00
Jeff Sharkey
996b60be9b am 7831c56e: Merge "Handle libcore, dalvik, gov imports."
* commit '7831c56ef524df688b6fe7a151671c92a6938837':
  Handle libcore, dalvik, gov imports.
2013-04-02 10:41:41 -07:00
Jeff Sharkey
06e6c6ad45 Handle libcore, dalvik, gov imports.
Change-Id: I25a9f1071f29eff615db03f3803a4ad1b5e6bec9
2013-03-26 15:33:56 -07:00
Andy McFadden
f0ed2f95f7 More include paths
Added two AV-related include paths.

Change-Id: I70b703b82943f3c8a473ef8f7fc0f7188cab9aef
2013-03-12 15:14:45 -07:00
Andy Stadler
dd5b61cd09 Clean up classpath - bye bye Camera
Change-Id: I988bacb5c4fdc071f77b174e934114bf655df0ed
2013-02-08 11:56:13 -08:00
Wink Saville
7dedc1f169 Update voip in classpath
frameworks/base/voip has been moved to frameworks/opt/net/voip
and is now a library.

Change-Id: I4b17697be2cf6d239b7d80920f10392df8b52be2
2013-01-30 10:26:29 -08:00
Andy Stadler
8af005c81c Update eclipse .classpath for current master config
* Email (back to old-school config until Email2 returns)
* SystemUI_intermediates
* mp4parser

Change-Id: I62f0b153b24368365202400515a4612e1b5ef22c
2013-01-14 10:28:32 -08:00
Andy McFadden
4db52ad567 Update Eclipse CDT include paths
include/arch moved
add libnativehelper for jni.h

Change-Id: I96367214cbdeb2e185fbda2c0cfaecc87a25164a
2012-11-28 14:33:21 -08:00
Andy Stadler
afa0c3fbbb am a103fc1e: Cleanup eclipse .classpath for Gallery2
* commit 'a103fc1e4ed59001673ca28ddf0dabde9b2c0f01':
  Cleanup eclipse .classpath for Gallery2
2012-11-12 13:50:28 -08:00
Andy Stadler
a103fc1e4e Cleanup eclipse .classpath for Gallery2
A couple of minor fixes to make eclipse happy.

Change-Id: Id9a30778efd3ef18e45efe316402971ca72a7c60
2012-11-12 13:42:25 -08:00
Andy Stadler
de479873e5 Classpath cleanups - DO NOT MERGE
* Add external/mp4parser
* Cleanup after Email rewinding

This does not affect system image builds at all - just fixes eclipse
workspace so there are no errors reported.

Change-Id: I2aee831e460b4acb63b2b999bab4131a08af6bd9
2012-10-02 16:40:54 -07:00
Andy Stadler
28f349bbb0 Merge commit '7a494baf' into manualmerge
Conflicts:
	ide/eclipse/.classpath

Change-Id: I0bb9abaef2525b38816f7901f13dd7ddb9167f4b
2012-09-24 17:47:47 -07:00
Andy Stadler
e61482e7e5 Fix .classpath to track bouncycastle/bcprov
Change-Id: If8d142ebc96eb76f1e0b12a8d741f2e91b5d8598
2012-09-24 17:34:26 -07:00
Daniel Sandler
4f316d8fd5 am 02d2b19f: am 35d22bff: Merge "Add screensavers to default Eclipse classpath." into jb-mr1-dev
* commit '02d2b19fb6e5210e74bdb691511699424b0d12ed':
  Add screensavers to default Eclipse classpath.
2012-09-24 13:45:40 -07:00
Daniel Sandler
91fd25b045 Add screensavers to default Eclipse classpath.
Change-Id: I691634e0f2dd6e3436087302caa09c9fb1eb92c2
2012-09-22 20:29:34 -04:00
Andy Stadler
dc64828674 am 92841986: am 00814d01: Fix .classpath
* commit '92841986ea924d55ce98f45b7716596f080d4e6f':
  Fix .classpath
2012-08-28 15:10:37 -07:00
Andy Stadler
00814d01e4 Fix .classpath
Change-Id: Id897c83e926069b667d9f1d048f89bbe84445aeb
2012-08-28 14:59:13 -07:00
Chiao Cheng
7b87c25291 Merge "Adding new packages to classpath." 2012-08-24 10:24:28 -07:00
Andy Stadler
a770685d55 Quick fixes for .classpath (eclipse happiness)
Change-Id: Ibbef12b7b253bf07abdfcb1dc0ae141baf7a9315
2012-08-23 11:29:03 -07:00
Chiao Cheng
d67ccf472b Adding new packages to classpath.
Bug: 6993891
Change-Id: I421bb648e97d1727b51fd00a1aaa01a84e8bd764
2012-08-21 18:38:10 -07:00
Mathias Agopian
4e2b37c89a update eclipse C++ include paths
Change-Id: Ie86250be5513e6ccc2780425d02a6c83397fd8e9
2012-08-13 14:18:17 -07:00
Nick Pelly
0956cd2055 Update eclipse .classpath
Change-Id: I0b9120c72c2e59544339280606307a9ebd15db51
2012-08-01 16:11:27 -07:00
Andy Stadler
d720b263b1 Add telephony intermediates to classpath
Change-Id: I019e3f2d4d3eb570590a8d1758b82cc1c1669c19
2012-07-23 17:41:28 -07:00
Wink Saville
d7269a0191 Add opt/telephony and opt/mms to eclipse .classpath
Change-Id: I7ac5ff06f72435dbe10463ca71413df1fde9e676
2012-07-17 15:20:47 -07:00
Andy Stadler
a2a3bab1af Eclipse classpath maintenance
* Email -> Email2
* Add frameworks/ex/photoviewer
* Remove filterfw_intermediates

Change-Id: I9b3dfcde9d9ed7bdddbab1d9f07e4cfe60658d10
2012-07-11 15:33:58 -07:00
Jean-Baptiste Queru
bf133cf2dd am 401a65b7: resolved conflicts for merge of 45cb1b0a to jb-dev-plus-aosp
* commit '401a65b7846fb87991142d9caa4a6176f75bbe27':
  Fix Eclipse classpath file for ICS.
2012-06-12 08:02:08 -07:00
Jean-Baptiste Queru
401a65b784 resolved conflicts for merge of 45cb1b0a to jb-dev-plus-aosp
Change-Id: I50fb4331347a1921a5a75eb91a216c7e0499e2d6
2012-06-12 07:58:42 -07:00
Marc Blank
b337343ed9 am 1d7f5824: am 2476301f: Fix up .classpath for Email/Exchange/emailcommon
* commit '1d7f5824ec5d3b1d7859a5d5b5fd736258680ead':
  Fix up .classpath for Email/Exchange/emailcommon
2012-05-25 10:11:21 -07:00
Marc Blank
2476301f4d Fix up .classpath for Email/Exchange/emailcommon
Change-Id: I7303f13d4544b81e2a2655319f310a3b6c5243b1
2012-05-24 15:29:47 -07:00
Andy Stadler
c26d4211cc Fix .classpath for eclipse. DO NOT MERGE
I've marked this do-not-merge because Email/Exchange are different
in master and this will probably break 'em.

Change-Id: I9f10bd41e143d7b9b6c784d503e79ec28e9f56c3
2012-05-16 15:58:26 -07:00
Brett Chabot
d2d16091aa Fix Eclipse classpath.
Remove Exchange/src, and add junit-runner.

Change-Id: I786a8732bf78413e96454f2201edc75f9ab639ac
2012-05-11 14:27:28 -07:00
Andy Stadler
a8863a9614 Eclipse classpath cleanup
- removed UnifiedEmail, not used in JB
- updated references to media/mca packages, which moved
- libcore junit stuff is now accessed via a library, built from external

Bug: 5584451
Change-Id: Ia5358c66ba191a3a08fea731ad5d8ba3e93c1f89
2012-05-02 11:32:16 -07:00
Mathias Agopian
d069948a49 update Eclipse include paths
Change-Id: Ia73ff3cc256ac0daaf3095441f595e271bc6c44e
2012-03-08 21:05:49 -08:00