Aurimas Liutikas
517c2d8a70
Merge "Make androidx imports sorted next to android." am: a9faa65e57
...
am: 56d4382e18
Change-Id: I4aed3e68e3f5a45a3ad14292766eac69ad6b68c3
2018-03-13 01:21:11 +00:00
Aurimas Liutikas
d2f8d56c74
Make androidx imports sorted next to android.
...
Test: None
Change-Id: Ia04eae337d206e9af7694ce0ac7c20f57ac8cb69
2018-03-12 16:05:39 -07:00
Peiyong Lin
f99f1ee6fc
[CLion] Remove legacy SurfaceFlinger CMakeLists.txt.
...
Now that we move SurfaceFlinger to use blueprint, we no longer need to write
manual CMakeLists.txt for SurfaceFlinger. This patch updates the native
CMakeLists.txt and removes the legacy file.
Test: make
Change-Id: I4097c5d3f564a47b0238bce62bb818b2835ceafc
2018-02-01 14:54:25 -08:00
Fabien Sanglard
ba1bfbfe4d
Add SurfaceFlinger/libgui/libui super cmakelist
...
Change-Id: I47e32b80a42a61ad00fe81ecd09aee4eae8c8234
2017-02-06 13:27:35 -08:00
Aurimas Liutikas
622d3d4c5b
Update Intellij config to work with new version of Intellij.
...
Cherry-pick of ag/853807
Tested with:
Android Studio 2.0 preview
Android Studio 1.5
Intellij 15
Change-Id: Ibc617cd0e5ac7b535158d5c8919c6c59441199a4
2016-02-02 10:38:29 -08:00
Aurimas Liutikas
e319357564
Fix import order config file for Intellij.
...
Start following out public style guide for imports:
https://source.android.com/source/code-style.html#order-import-statements
Bug: 25852971
Change-Id: I3db2b964cfc772657d71bcf5229d3ac27b6b3f2f
2015-12-18 13:04:28 -08:00
Jeff Sharkey
41150ce382
And yet another pass at cleaning up ordering.
...
am: 221249dc6e
* commit '221249dc6e37e8c6eb9201e97169bbf906ee1e4d':
And yet another pass at cleaning up ordering.
2015-12-18 20:27:40 +00:00
Jeff Sharkey
221249dc6e
And yet another pass at cleaning up ordering.
...
To meet the spirit of the style guide, this places "com.android" near
"android" to separate it from other "com" items.
It also enforces identical ordering on all static imports.
Change-Id: I51e9847a42505db5cec8b9083d1dbc840a47c2c3
2015-12-18 19:24:05 +00:00
Jeff Sharkey
b10259d1d2
Fix import order to match style guide.
...
am: cc31a92c11
* commit 'cc31a92c115be2ef4d9285410b7afbcbc1df9a88':
Fix import order to match style guide.
2015-12-18 19:08:16 +00:00
Jeff Sharkey
cc31a92c11
Fix import order to match style guide.
...
Change-Id: Ibd0d15b8d92f2d02d4279c9c7a90016d390e6abd
2015-12-18 17:45:30 +00:00
Christopher Tate
cb7c506c95
Add libcore/ojluni/ to Eclipse/IntelliJ templates
...
Change-Id: I96367a42fa4d0c3a2ac5471cdbc43a09e540ad61
2015-12-11 16:48:45 -08:00
Ben Weiss
6385bd10c9
Update code formatter to better reflect doc
...
The documentation at https://s.android.com/source/code-style.html
diverged with the actual implementation of the AndroidStyle.xml
* android imports are now on top
* spaces inside empty tags i.g."foo />"
* keep android:id, layout_width and layout_height as top xml atts.
Change-Id: Id51533bf4285e74bd8393529580fd0e168150cb8
2015-10-23 09:26:43 +00:00
Ben Wagner
901c6ba70d
Remove development/ide/xcode
...
This development code was imported a long time ago and is no longer
useful. It is misleading at best, since all of it relates to Skia as
it existed around six years ago.
Change-Id: I19bf913bd68247391df959a62c914d2b208bfdf3
2015-08-10 11:30:58 -04:00
Tony Mak
6c346c0f75
Static field name prefix should be 's'
...
According to http://source.android.com/source/code-style.html , static field should start with 's'
Change-Id: Ic883ddcdd42ba030bbe62ff1648440c25e927460
2015-05-01 15:04:44 +01:00
P.Y. Laligand
d85a813a0e
Updated the default classpath file for Eclipse.
...
Still some errors left due to mismatched package names and directory structure.
Change-Id: Ibce0e094479e6ff6d5f0946cde9b5695625ac439
2015-03-06 11:25:13 -08:00
Santos Cordon
11b9213ec5
Rename framework-base to framework in classpath.
...
Change-Id: Ie114c2624cbf1c3bbb4519832cd50568f662fa80
2014-08-12 16:58:06 -07:00
Santos Cordon
1f56ac3965
Add phone directory to frameworks/base.
...
Necessary to support the change: Id8b08d88a06a7b4e90a4a7f702ba56526e108ca5
Change-Id: Icc1aa0f2167c2aa36e1c51ed2f5488204778e5ed
2014-07-02 18:05:05 +00:00
Jeff Davidson
693140fd56
Fix the eclipse .classpath.
...
Many optional modules (development samples, screensavers, AOSP apps)
have been removed since they aren't strictly necessary. They can
always be readded by people who need to develop on them.
Change-Id: I97ca62ae28eb9230f38f567a1ae5fdd06dd04803
2014-06-24 17:29:23 -07:00
Brian Carlstrom
70b9e412bd
am af64fa58: am ef3d4ea0: am 2f43b93f: Merge "Replace libdvm reference with libart"
...
* commit 'af64fa580e6b3e250f0e3be7af09f462e553763e':
Replace libdvm reference with libart
2014-06-19 23:21:17 +00:00
Brian Carlstrom
af64fa580e
am ef3d4ea0: am 2f43b93f: Merge "Replace libdvm reference with libart"
...
* commit 'ef3d4ea038690127ca6c685017fea6fb3aeaf61d':
Replace libdvm reference with libart
2014-06-19 23:17:16 +00:00
Brian Carlstrom
a79fd769c1
Replace libdvm reference with libart
...
Bug: 14298175
Change-Id: Ia4ff2af37e977be5d03d2d6e118e8b89d607a732
2014-06-19 14:11:09 -07:00
Evan Charlton
a69f916a8b
resolved conflicts for merge of a706c744 to master-nova
...
Change-Id: I18498f7319dbe7ce8a52bb87106339c4046ac2c9
2014-05-12 17:19:20 -07:00
Kristian Monsen
384a2fa51a
All lines can be 100 cols according to the Android style guide
...
https://source.android.com/source/code-style.html
There is actually an exception that comments can have longer lines
if they a literal that is longer.
Change-Id: Iec82683c2ac1f68d08489f88bbfc924b58bc9a94
2014-03-05 18:44:20 +00:00
Igor Murashkin
4442be805d
classpath: add renderscript source directory
...
Change-Id: Ib5abe314c147bee83ef00e7203332fb3f9ee0508
2014-02-21 10:01:08 -08:00
Yuhao Zheng
d696802441
Merge "Add opt/net/wifi/service to eclipse .classpath"
2014-01-31 06:01:09 +00:00
Yuhao Zheng
12f62196c5
Add opt/net/wifi/service to eclipse .classpath
...
bug: 12175455
Change-Id: I49df46a1b87822d6cae87b5ed716040e3b6803b7
2014-01-16 10:27:25 -08:00
Amith Yamasani
52cf96e9aa
Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev
2014-01-15 22:06:55 +00:00
Santos Cordon
a706c74450
Adding telecomm to classpath and removing old Phone directory
...
references.
Change-Id: I55a309ae8912cf8cb9e27c9a5ed79cd34353a0a4
2014-01-06 15:00:07 -08:00
Amith Yamasani
a684a10e20
Update eclipse classpath due to change in directory structure
...
Moved frameworks/base/services/java to multiple subdirectories
Change-Id: I99b22ef38b7779f5eab50a721000ee9055d021af
2013-12-19 15:40:08 -08:00
Christopher Ferris
7bc2433721
Use uapi kernel headers.
...
Bug: 11559337
Change-Id: I9060b95f9e5d0b7d2173695d6a27df7b4d5d0758
2013-12-18 14:59:59 -08:00
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
7cba79795e
am 29fa33a6: am 47a0ba95: Merge "update include paths and symbols for eclipse" into jb-mr2-dev
...
* commit '29fa33a614ab3ad6f357d50662dfa03f9719e227':
update include paths and symbols for eclipse
2013-04-03 18:05:46 -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
f12f15407b
am 996b60be: am 7831c56e: Merge "Handle libcore, dalvik, gov imports."
...
* commit '996b60be9b74d1f42a959600895b3a25c622bd74':
Handle libcore, dalvik, gov imports.
2013-04-02 11:04:38 -07:00