From a7d6fc579f016e0bcd67597ce4870100b0f62ba2 Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Thu, 30 Apr 2015 11:10:56 -0700 Subject: [PATCH] CMSDK: Refactor compile, prepare for integration tests. Also don't build CMPlatformTests unless explicitely called. Change-Id: I3fd8f884d8815eab9987077766c0ff2fe3f98b4d --- Android.mk | 4 +--- .../platform/internal/CMStatusBarManagerTest.java | 7 +++++++ .../platform/internal/CMStatusBarManagerService.java | 0 .../org/cyanogenmod/platform/internal/ManagedServices.java | 0 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 cm/lib/androidTest/java/org/cyanogenmod/platform/internal/CMStatusBarManagerTest.java rename cm/lib/{ => main}/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java (100%) rename cm/lib/{ => main}/java/org/cyanogenmod/platform/internal/ManagedServices.java (100%) diff --git a/Android.mk b/Android.mk index fd47e87..8806a7c 100644 --- a/Android.mk +++ b/Android.mk @@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) cyanogenmod_app_src := src/java/ -library_src := cm/lib/java/org/cyanogenmod/platform/internal +library_src := cm/lib/main/java LOCAL_MODULE := org.cyanogenmod.platform LOCAL_MODULE_TAGS := optional @@ -127,5 +127,3 @@ include $(BUILD_DROIDDOC) cmplat.docs.src_files := cmplat.docs.java_libraries := intermediates.COMMON := - -include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/cm/lib/androidTest/java/org/cyanogenmod/platform/internal/CMStatusBarManagerTest.java b/cm/lib/androidTest/java/org/cyanogenmod/platform/internal/CMStatusBarManagerTest.java new file mode 100644 index 0000000..bde226d --- /dev/null +++ b/cm/lib/androidTest/java/org/cyanogenmod/platform/internal/CMStatusBarManagerTest.java @@ -0,0 +1,7 @@ +package org.cyanogenmod.platform.internal; + +/** + * Created by Adnan on 4/30/15. + */ +public class CMStatusBarManagerTest { +} diff --git a/cm/lib/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java similarity index 100% rename from cm/lib/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java rename to cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java diff --git a/cm/lib/java/org/cyanogenmod/platform/internal/ManagedServices.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/ManagedServices.java similarity index 100% rename from cm/lib/java/org/cyanogenmod/platform/internal/ManagedServices.java rename to cm/lib/main/java/org/cyanogenmod/platform/internal/ManagedServices.java