John Reck
c214b46d71
Fix the cmakes
...
Change-Id: I77c6484b882d1eaa45b2bc8ec94c6e6fb8526760
2020-11-10 15:17:35 -05:00
Ady Abraham
eb36c45d60
add FrameTimeline to CLion
...
Test: launch CLion
Change-Id: I293293c81dc891bc8d087e0744b03e4d4076f843
2020-09-30 16:24:21 -07:00
Ady Abraham
6a73d05209
Remove libsurfaceflinger-arm64-android
...
ag/12558259 removed that lib, updating the CMakeLists.txt to refrelet that.
Test: Launch Clion
Change-Id: Ia085c1647f5374bb209827c7dbc81c070673d4c2
2020-09-30 15:09:47 -07:00
John Reck
108bbc61e5
Add librenderengine
...
Test: clion
Change-Id: I9ddd72f7b7627ee27f099399ec2da88813439624
2020-08-12 13:10:47 -07:00
Ady Abraham
ea7685211d
remove obsolete path from frameworks/native
...
ag/11038755 removed some tests from SurfaceFlinger, so we need
to update CMakeLists.txt as well.
Test: Open CLion on fameworks/native project
Bug: b/77585359
Change-Id: Ide31716c85dca3c80979221577b444ecaffb6b32
2020-04-21 13:45:44 -07:00
Ana Krulec
d07f69ddf8
Adding relevant surface flinger files to CMake
...
Test: In IDE navigate to Tools -> CMake -> Reload, and it worked.
Change-Id: I16a240d93d77163886913e7bed8d9dcd52f98883
2020-01-16 13:42:25 -08:00
John Reck
0015dd7c76
Add libandroid-graphics to clion
...
Test: IDE
Change-Id: I89c6583d503f89254898d3540923a7a2f808485b
2019-10-30 15:12:20 -07:00
TreeHugger Robot
a0791b907c
Merge "Add HWUI's CMakeLists"
2019-08-13 00:45:25 +00:00
Dan Willemsen
8387a19fba
Merge "Remove emacs scripts" am: 996f9b13a0 am: ddf9c9bbeb am: 9c44f72603
...
am: 1a05a8512a
Change-Id: Ifd39b0c59ceb1cec2ae427d181dcbe4be7c82702
2019-07-19 07:57:27 -07:00
Dan Willemsen
ddf9c9bbeb
Merge "Remove emacs scripts"
...
am: 996f9b13a0
Change-Id: Ic55022dcaf960b1d81e745356edc14b3ad5b6f9c
2019-07-19 07:38:08 -07:00
Dan Willemsen
c607646faa
Remove emacs scripts
...
These haven't been touched in nearly 10 years, and make assumptions
about the build system that are either no longer true, or will no longer
be true soon.
Test: treehugger
Change-Id: I8bed2f9a7644f559e82b6958a783875089af2c2e
2019-07-18 14:07:39 -07:00
Ana Krulec
c24e581bb3
SF: Adding test and unittest folders to CMakeLists.txt
...
Adding folders to superproject for beter Clion integration.
Test: manual
Change-Id: I5abc405aa0dc0ca76c009709a18a7f0265775942
2019-06-21 14:51:25 -07:00
Stefano Galarraga
368f9abd35
Add root projects to use for development with CLion
...
The additional files are useful when generating the CLion project
definition (as documented in
https://android.googlesource.com/platform/build/soong/+/master/docs/clion.md )
to have a single view of the project.
Test: generate CLion project files and open the projects
Change-Id: I10d0a05a1ad827e253c46768f41ac87fa6d00fc9
2019-05-15 19:09:42 +01:00
Jeff Sharkey
22db5c0454
Fix import ordering for androidx.
...
Bug: 0
Test: none
Change-Id: Idb48d12d6dbfea625fba4c51406dfb93f0899332
2019-03-22 14:06:15 -06:00
John Reck
db85ede0f4
Add HWUI's CMakeLists
...
Test: n/a
Change-Id: I9e1a9a5cf5d185fedd61bbc498d8f7c9a85642f3
2019-02-20 13:43:47 -08:00
Santos Cordon
09c23bef97
Additional classpath changes for us dying few that still use eclipse.
...
Test: Verified that my computer did not explode.
Change-Id: Ia3dca5d524d1afc380539a7fd01c303ecaefcedc
2018-08-23 13:54:23 +01:00
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