Commit Graph

39 Commits

Author SHA1 Message Date
Treehugger Robot
c65b20e6b6 Merge "idegen: traversing all vendor-specific excludes" 2022-01-17 12:55:14 +00:00
Bob Badour
f7cf305656 [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/BluetoothDebug/Android.bp
  apps/BuildWidget/Android.bp
  apps/CustomLocale/Android.bp
  apps/DevelopmentSettings/Android.bp
  apps/Fallback/Android.bp
  apps/GestureBuilder/Android.bp
  apps/NinePatchLab/Android.bp
  apps/OBJViewer/Android.bp
  apps/PushApiAuthenticator/Android.bp
  apps/PushApiTestAppOne/Android.bp
  apps/PushApiTestAppTwo/Android.bp
  apps/SdkSetup/Android.bp
  apps/SettingInjectorSample/Android.bp
  apps/WidgetPreview/Android.bp
  apps/launchperf/Android.bp
  cmds/monkey/Android.mk
  gsi/gsi_util/Android.bp
  gsi/repack_super_image/Android.bp
  host/windows/Android.bp
  python-packages/Android.bp
  samples/AccelerometerPlay/Android.bp
  samples/AdaptiveIconSample/Android.bp
  samples/AliasActivity/Android.bp
  samples/AndroidBeamDemo/Android.bp
  samples/AppNavigation/Android.bp
  samples/AutofillKeyboard/Android.bp
  samples/BackupRestore/Android.bp
  samples/BasicGLSurfaceView/Android.bp
  samples/BluetoothChat/Android.bp
  samples/BrokenKeyDerivation/Android.bp
  samples/BrokenKeyDerivation/tests/Android.bp
  samples/BusinessCard/Android.bp
  samples/Compass/Android.bp
  samples/ContactManager/Android.bp
  samples/CubeLiveWallpaper/Android.bp
  samples/DataWiper/Android.bp
  samples/DeviceAdminWhitelistedAccount/Android.bp
  samples/FixedGridLayout/Android.bp
  samples/HeavyWeight/Android.bp
  samples/HelloActivity/Android.bp
  samples/HelloActivity/tests/Android.bp
  samples/HelloEffects/Android.bp
  samples/Home/Android.bp
  samples/HoneycombGallery/Android.bp
  samples/InlineFillService/Android.bp
  samples/JetBoy/Android.bp
  samples/LceDemo/Android.bp
  samples/LunarLander/Android.bp
  samples/LunarLander/tests/Android.bp
  samples/MultiResolution/Android.bp
  samples/MultiWindow/Android.bp
  samples/MySampleRss/Android.bp
  samples/NotePad/Android.bp
  samples/Obb/Android.bp
  samples/RSSReader/Android.bp
  samples/ReceiveShareDemo/Android.bp
  samples/SampleSyncAdapter/Android.bp
  samples/SimpleJNI/Android.bp
  samples/SimpleJNI/jni/Android.bp
  samples/SipDemo/Android.bp
  samples/SkeletonApp/Android.bp
  samples/SkeletonApp/tests/Android.bp
  samples/Snake/Android.bp
  samples/Snake/tests/Android.bp
  samples/SoftKeyboard/Android.bp
  samples/SpellChecker/HelloSpellChecker/Android.bp
  samples/SpellChecker/SampleSpellCheckerService/Android.bp
  samples/StackWidget/Android.bp
  samples/ThemedNavBarKeyboard/Android.bp
  samples/ToyVpn/Android.bp
  samples/TtsEngine/Android.bp
  samples/USB/AdbTest/Android.bp
  samples/USB/MissileLauncher/Android.bp
  samples/UiAutomator/Android.mk
  samples/Vault/Android.bp
  samples/Vault/tests/Android.bp
  samples/VoiceRecognitionService/Android.bp
  samples/VoicemailProviderDemo/Android.bp
  samples/WeatherListWidget/Android.bp
  samples/WiFiDirectDemo/Android.bp
  samples/WiFiDirectServiceDiscovery/Android.bp
  samples/Wiktionary/Android.bp
  samples/WiktionarySimple/Android.bp
  samples/XmlAdapters/Android.bp
  samples/apkcachetest/Android.bp
  samples/training/NsdChat/Android.bp
  scripts/Android.bp
  testrunner/Android.mk
  testrunner/tests/Android_native.mk
  tools/apkcheck/Android.bp
  tools/bugreport/Android.bp
  tools/etc1tool/Android.bp
  tools/idegen/Android.bp
  tools/mkstubs/Android.bp
  tools/rmtypedefs/Android.bp
  vndk/Android.bp
  vndk/tools/Android.bp
  vndk/tools/elfcheck/Android.bp
  vndk/tools/header-checker/Android.bp
  vndk/tools/header-checker/src/repr/protobuf/proto/Android.bp
  vndk/tools/header-checker/tests/integration/ifunc/Android.bp
  vndk/tools/header-checker/tests/integration/version_script_example/Android.bp
  vndk/tools/image-diff-tool/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CPL-1.0 SPDX-license-identifier-MIT
    SPDX-license-identifier-Unicode-DFS SPDX-license-identifier-W3C
    legacy_restricted legacy_unencumbered
to:
  Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CPL-1.0
to:
  samples/SearchableDictionary/Android.bp

Added SPDX-license-identifier-Apache-2.0 legacy_unencumbered
to:
  tools/Android.bp

Added SPDX-license-identifier-BSD SPDX-license-identifier-CPL-1.0
    SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS
    SPDX-license-identifier-W3C
to:
  sdk/Android.bp

Added legacy_restricted
to:
  samples/KeyChainDemo/Android.bp
  tools/line_endings/Android.bp
  vndk/tools/definition-tool/datasets/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I9847e00fb4278bc083b4debbc751003c995ea45c
2021-02-12 17:13:45 -08:00
utzcoz
0609c877cf Remove unused imports from Main.java
Test: mm.

Change-Id: I22589ca03914833b569c969c011a932f9c564dca
Signed-off-by: utzcoz <utzcoz@gmail.com>
2020-05-09 17:08:36 +08:00
Mikhail Malakhov
926b01325d idegen: traversing all vendor-specific excludes
Allow vendors to have your own idegen "excluded-paths" files.

Change-Id: I842ce4f89bcb43a8bcfde827e4683d11c29f0624
2020-03-22 11:49:40 +03:00
Colin Cross
9502c0fe6a Update idegen for guava 27.1
Objects.toStringHelper has been replaced with
MoreObjects.toStringHelper.

Bug: 130306229
Test: m checkbuild
Change-Id: I0110d355aa071f3f5c8174c7dfa3c8403ac8f596
2019-04-11 16:38:07 -07:00
Aurimas Liutikas
788e18625a Merge "idegen: Add darwin support for index-gen" am: ad14f556e2 am: 7af51100c6
am: b3ee377578

Change-Id: I04418a4bad42c67aeb4ad44d560ed94cdf4c80c0
2019-04-03 03:01:04 -07:00
Brandon McAnsh
66e5fb0f7f idegen: Add darwin support for index-gen
Change-Id: I1f4490bc224a4275a6345bbfae92b9fdc62bde3e
Signed-off-by: Brandon McAnsh <brandon@moblabs.com>
2019-03-22 14:49:46 -04:00
Enrico Granata
fbe91c90cf idegen fails to build a correct dependency graph if one of the submodules it identifies lacks an Android.mk file
The current failure mode is for the tool to throw an Exception and stop.
This commit makes it possible for the tool to continue in the face of such a missing .mk file.

Test: manual
Change-Id: I42991fe7cda07e0fae2eb037649d88133afde1c7
2018-04-04 14:11:58 -07:00
Christian Oder
644f60e93c idegen: Add compatibility for custom out directory
At the moment the script looks for the jar iside the out dir.
However, if the our dir is set to a different directory via OUT_DIR_COMMON_BASE
the script does not notice that, and errors out saying a build is
needed.

This commits checks if the OUT_DIR_COMMON_BASE is set, then searches the jar in the proper path.
If OUT_DIR_COMMON_BASE is unset, search in "out" like it did before.

Test: Build with OUT_DIR_COMMON_BASE set and unset and verify idegen works in both cases.

Change-Id: Icfcf41af13139bd81f8589bb900debe5ee616022
2017-12-22 12:44:03 +00:00
Colin Cross
6d7b346407 Convert development/tools to Android.bp
See build/soong/README.md for more information

Also moves rmtypedefs to use the guava prebuilt from
prebuilts/misc/common.

Test: m checkbuild
Change-Id: I9298967275ca40f8d50841b204cd40612a8a5f56
2017-10-24 16:15:15 -07:00
Aurimas Liutikas
f2e4985ba0 Update default Java level for idegen.
This sets it to 1.8 instead of 1.7 as Android now allows using
1.8 java language.

Bug: 38140365
Test: Ran idegen and now java language is set to 1.8 in Intellij
Change-Id: I1a1f0970357f42c3bc5ded9b3f17692812ea130a
2017-05-09 08:08:07 -07:00
Eino-Ville Talvala
6a65b38d23 Idegen: Don't assume a backslash is preceded by a space
Only remove a backslash, nothing more. Otherwise a line with just
a backslash will cause a crash.

Bug: 28218145
Change-Id: I540a2508ba1fbd3f03cf8258d1fe4b99e0472c88
2016-04-15 14:06:53 -07:00
Yohei Yukawa
0cc92c5011 Merge "Modify Idegen to open project with Android facet" am: b8159cc98c
am: 273207859c

* commit '273207859c732ca3233d0b90f587a4e2f7ebd54c':
  Modify Idegen to open project with Android facet
2016-01-21 05:31:21 +00:00
dbgsprw
ec27ae9a22 Modify Idegen to open project with Android facet
Previously, After idegen command executed, Android Studio
and Intellij didn't start with Android facet.

Android Device Monitor, AVD, etc are necessary,
so edit template android.iml for opening project with them.

Change-Id: I7734e45afc268aa4eabdd96854c775452f8426a7
Signed-off-by: dbgsprw <dbgsprw@gmail.com>
2016-01-21 02:18:32 +00:00
Yohei Yukawa
a6b714374d Merge "Updating Idegen project to use JDK 1.7" am: 72f24a0fa1
am: f499ad0961

* commit 'f499ad096171639c013c0ec21f730ed25da34998':
  Updating Idegen project to use JDK 1.7
2015-12-15 08:17:48 -08:00
Yohei Yukawa
72f24a0fa1 Merge "Updating Idegen project to use JDK 1.7" 2015-12-15 05:01:56 +00:00
Xiaohui Chen
0b7e903d4c Fix exception in MakeFileParser
The code currently tries to parse all "$" as variables.  Now narrow it
down to only "$()" as it should.

Bug: 23155276
Change-Id: I1732ce757a9f7d611e90138b595a0aa1d3ce6009
2015-12-08 19:03:23 -08:00
Michael
6836ddf514 Updating Idegen project to use JDK 1.7
Updating Idegen intellij template to use JDK 1.7, which is required for
marshmallow.

Change-Id: I4ad02acb19fa850a62b6a25bbbaf4db2577a9fe0
2015-12-06 13:54:56 +01:00
Ying Wang
8ee57970d5 Skip nonexistent files/directories (e.g. broken symlinks) in idegen.jar.
We may have broken symlinks in the experimental directories. They
shouldn't fail the idegen.

Bug: 25389477
Change-Id: Ie94ebba9225c928a0990347da259ed7bbd4c9fe1
2015-11-02 17:23:02 -08:00
Xiaohui Chen
6984d17aa7 intellij-gen: Fix test source dir tag.
Change-Id: Iba8ab25f27f72088088b06ea180bc3b8e912e5c9
2015-08-24 22:11:59 -07:00
Xiaohui Chen
aa5d149bd3 Make intellij-gen.sh take one dir
The common usage from a couple fellow engineers shows that we tend to
put the idea project right at the module root.  This update simplifies
this common use case.

Change-Id: I6020a4e13e376fa2f7641f36a5d4b1b8637fbd86
2015-08-13 13:23:04 -07:00
Xiaohui Chen
3cd9e24e0c Fix exception in MakeFileParser
The code currently tries to parse all "$" as variables.  Now narrow it
down to only "$()" as it should.

Bug: 23155276
Change-Id: I1732ce757a9f7d611e90138b595a0aa1d3ce6009
2015-08-12 20:38:50 +00:00
Xiaohui Chen
e472fe6d27 intellij-gen: fix git root problem
Some module dir may not be the git root itself.  Some modules may
share the same git root. e.g. "development/tools/apkcheck" module's
git root is "development/".  So we need to look at the parent
directories too when going through all the modules.

Change-Id: Id2ce859efc0d5f6286eb8545fd6a21244e7d40a6
2015-04-29 20:50:18 -07:00
Xiaohui Chen
8145bd2753 Merge "intellij-gen: fix framework dependencies" 2015-04-29 17:17:14 +00:00
Xiaohui Chen
b6615dc7f0 intellij-gen: default to use jdk 1.7
1.7 language features seems already used in Android codebase.  Let's
move the generated project config to match that.

Change-Id: I0269f2e73417393bcd7894356caaea5c48b9d0e1
2015-04-27 14:45:10 -07:00
Xiaohui Chen
27639ae3db intellij-gen: fix framework dependencies
FrameworkModule has special case dependencies generation.  It is
currently missing some.  This cl fixes that and also fixed an edge case
when finding src directories.

Change-Id: I1593d92530715f3bbc8683cc32164fde4a29f0d8
2015-04-06 14:19:13 -07:00
Paul Crowley
7fdedf010d Refactor the way we handle directories in traverse.
Bug: 18064146
Change-Id: I45fba9c2978bc0c8f23804c730ab631da759ac70
2014-11-03 04:28:54 +00:00
Sky Faber
e83d6400fb idegen: Skip directories named *.java when parsing source.
Change-Id: I8a6700ebcc198851b80de4832a43d147dc887f3a
2014-07-23 13:50:52 -07:00
Evan Charlton
ffa8245e66 Add support for OSX to intellij-gen.sh
Remove the hardcoded "linux-x86" path, and add support for darwin-x86.

Change-Id: I4c5db4683a6e8aac7d894e64415142d2ca5954a2
2014-05-20 10:55:54 -07:00
Chiao Cheng
c8201d5e84 Overhaul of intellij-gen script.
Overall much better at find proper dependencies.
* No more need for aggregate modules.
* Source file searching.
* Make file token substitution.
* Inclusion src directories.
* Multi project/package support.
* Made framework module optional as some unbundled
  branches do not include it.

Change-Id: Ie5ee66c488fc9141043137f716a3891f952bfe7f
2014-03-17 12:52:43 -07:00
Chiao Cheng
6818901ea0 Add support for distribution folder.
Changed template directory to be dynamically looked up.

Change-Id: I89b96581e842574e1c7ad36e8633d3e787f488c2
2013-03-01 10:55:30 -08:00
Chiao Cheng
d7a603c968 Allow bash scripts to work within a distributation folder.
- Fixed NullPointerException when module name not found.

Change-Id: I8f9b29f047ff90995d4cccc6b4b518bfbf026570
2013-02-28 15:25:05 -08:00
Chiao Cheng
ac0a18e095 Adding new script to generate Intellij projects.
- Creates modules and includes only dependencies that are needed by
the parent module instead of including the entire source tree. The
new structure makes intellij much more responsive and fast.
- Adds proper android facets when AndroidManifest.xml exists for
quick resource lookup.
- Automatically includes intermediates directory for generated R files.
- Exclusion of un-neccessary language resource folders from id lookups.
- Automatic vcs configuration for git roots.
- Multi-module make file support.
- Aggregate modules for multi-module make files.

Change-Id: I181670b269faa1cc3ab257692833821fab20f73c
2012-08-08 17:23:48 -07:00
Chiao Cheng
797198bbe0 Updating intellij idegen project template to use jdk 1.6.
Also excluding prebuilt jars from classpath. These include all
previous versions of the android sdk jars. Increased heap size to 800
so google intellij plugin does not complain. Changed default
configuration to use global code style insead of per project code
style.

Change-Id: If97550000fdc282cf6d506eb80b830ff4c1b87b9
2012-06-01 15:27:36 -07:00
Jake Hamby
ad716fc412 Exclude some non-source folders from IntelliJ projects.
Add some excludeFolder lines to android.iml generated by idegen.sh.
This removes a large number of non-Java files that IntelliJ would
otherwise have to stat and parse.

Change-Id: I362711daba6cc0c7ebec761d013c57c27a29d58d
2011-08-09 16:00:35 -07:00
Debajit Ghosh
5f2ff00773 fixing NPE that i see on my Mac when running idegen.sh 2009-09-01 22:20:31 -07:00
The Android Open Source Project
52d4c30ca5 auto import from //depot/cupcake/@135843 2009-03-03 19:29:09 -08:00
The Android Open Source Project
d4aee0c0ca auto import from //depot/cupcake/@135843 2009-03-03 18:28:16 -08:00
The Android Open Source Project
e943f2fd8e Code drop from //branches/cupcake/...@124589 2008-12-17 18:04:04 -08:00