Add missing notice files.
Also fix some makefiles to make sure the notices are
picked up.
- move the makefile outside of the source folder.
- resources are now in the source folder directly instead
of being inside src/resources. It's much simpler.
Change-Id: Ica8ee4c2bc8a9b035d23fc914d4137cdca7e567d
diff --git a/sdkmanager/libs/sdkuilib/Android.mk b/sdkmanager/libs/sdkuilib/Android.mk
index 33f8a9d..671fc95 100644
--- a/sdkmanager/libs/sdkuilib/Android.mk
+++ b/sdkmanager/libs/sdkuilib/Android.mk
@@ -13,7 +13,30 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-SDKUILIB_LOCAL_DIR := $(call my-dir)
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_JAVA_RESOURCE_DIRS := src
+
+# IMPORTANT: if you add a new dependency here, please make sure
+# to also check the following file:
+# sdkmanager/app/etc/android.bat
+# (Note: there is no manifest.txt for sdkuilib.)
+LOCAL_JAVA_LIBRARIES := \
+ sdklib \
+ common \
+ androidprefs \
+ swt \
+ org.eclipse.jface_3.4.2.M20090107-0800 \
+ org.eclipse.equinox.common_3.4.0.v20080421-2006 \
+ org.eclipse.core.commands_3.4.0.I20080509-2000
+
+LOCAL_MODULE := sdkuilib
+
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+
# Build all sub-directories
-include $(call all-makefiles-under,$(SDKUILIB_LOCAL_DIR))
+include $(call all-makefiles-under,$(LOCAL_PATH))