Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev

Browse Source 
* commit '579338345721351313d4c3cd2a5114a0d135028d':
  Fix Tests after cherry picks. [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-10-02 03:34:19 +00:00
committed by Android Git Automerger
parent 735229c5a8 5793383457
commit d00d2ff207
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/layoutlib/.idea/runConfigurations/Create.xml generated
View File

@@ -3,7 +3,7 @@
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.android.tools.layoutlib.create.Main" /> <option name="MAIN_CLASS_NAME" value="com.android.tools.layoutlib.create.Main" />
<option name="VM_PARAMETERS" value="" /> <option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/javalib.jar" /> <option name="PROGRAM_PARAMETERS" value="out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/javalib.jar" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../../../../" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../../../../" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="1.6" /> <option name="ALTERNATIVE_JRE_PATH" value="1.6" />

8
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
View File

@@ -161,7 +161,7 @@ public class Main {
if (!out.isDirectory()) { if (!out.isDirectory()) {
return null; return null;
} }
File sdkDir = new File(out, "sdk" + File.separator + "sdk"); File sdkDir = new File(out, "sdk");
if (!sdkDir.isDirectory()) { if (!sdkDir.isDirectory()) {
// The directory we thought that should contain the sdk is not a directory. // The directory we thought that should contain the sdk is not a directory.
return null; return null;
@@ -283,14 +283,14 @@ public class Main {
} }
/** /**
* Uses Theme.Material and Target sdk version as 21. * Uses AppTheme and Target sdk version as 19.
*/ */
private SessionParams getSessionParams(LayoutPullParser layoutParser, private SessionParams getSessionParams(LayoutPullParser layoutParser,
ConfigGenerator configGenerator, LayoutLibTestCallback layoutLibCallback) { ConfigGenerator configGenerator, LayoutLibTestCallback layoutLibCallback) {
FolderConfiguration config = configGenerator.getFolderConfig(); FolderConfiguration config = configGenerator.getFolderConfig();
ResourceResolver resourceResolver = ResourceResolver resourceResolver =
ResourceResolver.create(mProjectResources.getConfiguredResources(config), ResourceResolver.create(mProjectResources.getConfiguredResources(config),
mFrameworkRepo.getConfiguredResources(config), "Theme.Material", false); mFrameworkRepo.getConfiguredResources(config), "AppTheme", true);
return new SessionParams( return new SessionParams(
layoutParser, layoutParser,
@@ -300,7 +300,7 @@ public class Main {
resourceResolver, resourceResolver,
layoutLibCallback, layoutLibCallback,
0, 0,
21, // TODO: Make it more configurable to run tests for various versions. 19, // TODO: Make it more configurable to run tests for various versions.
getLayoutLog()); getLayoutLog());
} }