Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f0e467a authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE] 

The variable is not actually needed and it makes working with different
API levels a lot easier since everything now depends on $PROJECT_DIR$.

This change also makes the tests more robust by improving the way it
tries to find the SDK.

Change-Id: I3502ad4a0ba85fd88b497e47964fddb2a89e520c
(cherry picked from commit 5377695d4ecf3cc6dc1abe59bbfca63f6137b722)
parent 2f3715aa

tools/layoutlib/.idea/libraries/asm_4_0.xml

+2 −2
Original line number Diff line number Diff line 
<component name="libraryTable">

  <library name="asm-4.0">

    <CLASSES>

      <root url="jar://$ANDROID_BUILD_TOP$/prebuilts/misc/common/asm/asm-4.0.jar!/" />

      <root url="jar://$PROJECT_DIR$/../../../../prebuilts/misc/common/asm/asm-4.0.jar!/" />

    </CLASSES>

    <JAVADOC />

    <SOURCES>

      <root url="jar://$ANDROID_BUILD_TOP$/prebuilts/misc/common/asm/src.zip!/" />

      <root url="jar://$PROJECT_DIR$/../../../../prebuilts/misc/common/asm/src.zip!/" />

    </SOURCES>

  </library>

</component>
 
 No newline at end of file

tools/layoutlib/.idea/libraries/framework_jar.xml

+4 −4
Original line number Diff line number Diff line 
<component name="libraryTable">

  <library name="framework.jar">

    <CLASSES>

      <root url="jar://$ANDROID_BUILD_TOP$/out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar!/" />

      <root url="jar://$PROJECT_DIR$/../../../../out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar!/" />

    </CLASSES>

    <JAVADOC />

    <SOURCES>

      <root url="file://$ANDROID_BUILD_TOP$/frameworks/base/core/java" />

      <root url="file://$ANDROID_BUILD_TOP$/frameworks/base/graphics/java" />

      <root url="file://$ANDROID_BUILD_TOP$/libcore/luni/src/main/java" />

      <root url="file://$PROJECT_DIR$/../../core/java" />

      <root url="file://$PROJECT_DIR$/../../graphics/java" />

      <root url="file://$PROJECT_DIR$/../../../../libcore/luni/src/main/java" />

    </SOURCES>

  </library>

</component>
 
 No newline at end of file

tools/layoutlib/.idea/libraries/guava.xml

+2 −2
Original line number Diff line number Diff line 
<component name="libraryTable">

  <library name="guava">

    <CLASSES>

      <root url="jar://$ANDROID_BUILD_TOP$/out/host/common/obj/JAVA_LIBRARIES/guavalib_intermediates/javalib.jar!/" />

      <root url="jar://$PROJECT_DIR$/../../../../out/host/common/obj/JAVA_LIBRARIES/guavalib_intermediates/javalib.jar!/" />

    </CLASSES>

    <JAVADOC />

    <SOURCES>

      <root url="file://$ANDROID_BUILD_TOP$/external/guava/guava/src" />

      <root url="file://$PROJECT_DIR$/../../../../external/guava/guava/src" />

    </SOURCES>

  </library>

</component>
 
 No newline at end of file

tools/layoutlib/.idea/libraries/icu4j.xml

+1 −1
Original line number Diff line number Diff line 
<component name="libraryTable">

  <library name="icu4j">

    <CLASSES>

      <root url="jar://$ANDROID_BUILD_TOP$/prebuilts/misc/common/icu4j/icu4j.jar!/" />

      <root url="jar://$PROJECT_DIR$/../../../../prebuilts/misc/common/icu4j/icu4j.jar!/" />

    </CLASSES>

    <JAVADOC>

      <root url="http://icu-project.org/apiref/icu4j50rc/" />

tools/layoutlib/.idea/libraries/kxml2_2_3_0.xml

+2 −2
Original line number Diff line number Diff line 
<component name="libraryTable">

  <library name="kxml2-2.3.0">

    <CLASSES>

      <root url="jar://$ANDROID_BUILD_TOP$/prebuilts/misc/common/kxml2/kxml2-2.3.0.jar!/" />

      <root url="jar://$PROJECT_DIR$/../../../../prebuilts/misc/common/kxml2/kxml2-2.3.0.jar!/" />

    </CLASSES>

    <JAVADOC />

    <SOURCES>

      <root url="file://$ANDROID_BUILD_TOP$/libcore/xml/src/main/java" />

      <root url="file://$PROJECT_DIR$/../../../../libcore/xml/src/main/java" />

    </SOURCES>

  </library>

</component>
 
 No newline at end of file