diff options
Diffstat (limited to 'tools')
7 files changed, 21 insertions, 8 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index b3c364b..8341de6 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -2574,8 +2574,12 @@ status_t ResourceTable::addSymbols(const sp<AaptSymbols>& outSymbols) { continue; } const size_t N = t->getOrderedConfigs().size(); - sp<AaptSymbols> typeSymbols; - typeSymbols = outSymbols->addNestedSymbol(String8(t->getName()), t->getPos()); + sp<AaptSymbols> typeSymbols = + outSymbols->addNestedSymbol(String8(t->getName()), t->getPos()); + if (typeSymbols == NULL) { + return UNKNOWN_ERROR; + } + for (size_t ci=0; ci<N; ci++) { sp<ConfigList> c = t->getOrderedConfigs().itemAt(ci); if (c == NULL) { diff --git a/tools/layoutlib/.idea/codeStyleSettings.xml b/tools/layoutlib/.idea/codeStyleSettings.xml index 33937b3..b324213 100644 --- a/tools/layoutlib/.idea/codeStyleSettings.xml +++ b/tools/layoutlib/.idea/codeStyleSettings.xml @@ -27,12 +27,12 @@ <package name="" withSubpackages="true" static="true" /> </value> </option> + <option name="RIGHT_MARGIN" value="100" /> <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" /> <option name="JD_ALIGN_PARAM_COMMENTS" value="false" /> <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" /> <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" /> <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" /> - <option name="RIGHT_MARGIN" value="100" /> <option name="WRAP_COMMENTS" value="true" /> <XML> <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" /> diff --git a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java index fbe21a8..aaba545 100644 --- a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java +++ b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java @@ -809,11 +809,6 @@ public final class BridgeTypedArray extends TypedArray { return new CharSequence[] { value }; } - Bridge.getLog().warning(LayoutLog.TAG_RESOURCES_FORMAT, - String.format( - String.format("Unknown value for getTextArray(%d) => %s", //DEBUG - index, mResourceData[index].getName())), null); - return null; } diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java index 130500a..0ed6ab1 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java @@ -174,6 +174,11 @@ public final class BridgeWindowSession implements IWindowSession { } @Override + public void setWallpaperDisplayOffset(IBinder windowToken, int x, int y) { + // pass for now. + } + + @Override public Bundle sendWallpaperCommand(IBinder window, String action, int x, int y, int z, Bundle extras, boolean sync) { // pass for now. diff --git a/tools/layoutlib/bridge/tests/Android.mk b/tools/layoutlib/bridge/tests/Android.mk index 7a9e067..5e47c8c 100644 --- a/tools/layoutlib/bridge/tests/Android.mk +++ b/tools/layoutlib/bridge/tests/Android.mk @@ -34,5 +34,8 @@ LOCAL_JAVA_LIBRARIES := layoutlib \ include $(BUILD_HOST_JAVA_LIBRARY) +# Copy the jar to DIST_DIR for sdk builds +$(call dist-for-goals, sdk win_sdk, $(LOCAL_INSTALLED_MODULE)) + # Build all sub-directories include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tools/layoutlib/create/Android.mk b/tools/layoutlib/create/Android.mk index 9bd48ab..e6f0bc3 100644 --- a/tools/layoutlib/create/Android.mk +++ b/tools/layoutlib/create/Android.mk @@ -26,3 +26,6 @@ LOCAL_MODULE := layoutlib_create include $(BUILD_HOST_JAVA_LIBRARY) +# Build all sub-directories +include $(call all-makefiles-under,$(LOCAL_PATH)) + diff --git a/tools/layoutlib/create/tests/Android.mk b/tools/layoutlib/create/tests/Android.mk index 0052ec2..c197d57 100644 --- a/tools/layoutlib/create/tests/Android.mk +++ b/tools/layoutlib/create/tests/Android.mk @@ -28,5 +28,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := asm-4.0 include $(BUILD_HOST_JAVA_LIBRARY) +# Copy the jar to DIST_DIR for sdk builds +$(call dist-for-goals, sdk win_sdk, $(LOCAL_INSTALLED_MODULE)) + # Build all sub-directories include $(call all-makefiles-under,$(LOCAL_PATH)) |