LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Updating Idegen project to use JDK 1.7"

Browse Source
This commit is contained in:
Yohei Yukawa
2015-12-15 05:01:56 +00:00
committed by Gerrit Code Review
parent 3578bf1c87 6836ddf514
commit 72f24a0fa1
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/idegen/README
View File

@@ -10,7 +10,7 @@ If you're using IntelliJ...
in "IDEA_HOME/bin/idea.vmoptions" on Linux or in "IDEA_HOME/bin/idea.vmoptions" on Linux or
"IntelliJ IDEA.app/Contents/Info.plist" on OS X. "IntelliJ IDEA.app/Contents/Info.plist" on OS X.
Create a JDK configuration named "1.6 (No Libraries)" by adding a new Create a JDK configuration named "1.7 (No Libraries)" by adding a new
JDK like you normally would and then removing all of the jar entries JDK like you normally would and then removing all of the jar entries
under the "Classpath" tab. This will ensure that you only get access to under the "Classpath" tab. This will ensure that you only get access to
Android's core libraries and not those from your desktop VM. Android's core libraries and not those from your desktop VM.
@@ -36,7 +36,7 @@ If you're using Eclipse...
Edit eclipse.ini ("Eclipse.app/Contents/MacOS/eclipse.ini" on OS X) and Edit eclipse.ini ("Eclipse.app/Contents/MacOS/eclipse.ini" on OS X) and
add "-Xms748m -Xmx748m" to your VM options. add "-Xms748m -Xmx748m" to your VM options.
Configure a JRE named "1.5 (No Libraries)" under "Preferences -> Java -> Configure a JRE named "1.7 (No Libraries)" under "Preferences -> Java ->
Installed JREs". Remove all of the jar entries underneath "JRE system Installed JREs". Remove all of the jar entries underneath "JRE system
libraries". Eclipse will not let you save your configuration unless at libraries". Eclipse will not let you save your configuration unless at
least one jar is present, so include a random jar that won't get in the least one jar is present, so include a random jar that won't get in the

2
tools/idegen/idegen.ipr
View File

@@ -298,7 +298,7 @@
<module fileurl="file://$PROJECT_DIR$/idegen.iml" filepath="$PROJECT_DIR$/idegen.iml" /> <module fileurl="file://$PROJECT_DIR$/idegen.iml" filepath="$PROJECT_DIR$/idegen.iml" />
</modules> </modules>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6 (no libraries)" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7 (no libraries)" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/classes" /> <output url="file://$PROJECT_DIR$/classes" />
</component> </component>
<component name="RmicSettings"> <component name="RmicSettings">

2
tools/idegen/templates/android.ipr
View File

@@ -281,7 +281,7 @@
<module fileurl="file://$PROJECT_DIR$/android.iml" filepath="$PROJECT_DIR$/android.iml" /> <module fileurl="file://$PROJECT_DIR$/android.iml" filepath="$PROJECT_DIR$/android.iml" />
</modules> </modules>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6 (No Libraries)" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7 (No Libraries)" project-jdk-type="JavaSDK">
<output url="file:///tmp/intellij$PROJECT_DIR$/classes" /> <output url="file:///tmp/intellij$PROJECT_DIR$/classes" />
</component> </component>
<component name="RmicSettings"> <component name="RmicSettings">