diff --git a/YOGA_DEFS b/YOGA_DEFS index 9548554a..ec3ed484 100644 --- a/YOGA_DEFS +++ b/YOGA_DEFS @@ -4,7 +4,7 @@ JAVA_TARGET = '//java:java' INFER_ANNOTATIONS_TARGET = '//lib/infer-annotations:infer-annotations' JSR_305_TARGET = '//lib/jsr-305:jsr-305' JUNIT_TARGET = '//lib/junit:junit' -PROGRUARD_ANNOTATIONS_TARGET = '//java/com/facebook/proguard/annotations:annotations' +PROGRUARD_ANNOTATIONS_TARGET = '//java/proguard-annotations/src/main/java/com/facebook/proguard/annotations:annotations' SOLOADER_TARGET = '//lib/soloader:soloader' GTEST_TARGET = '//lib/gtest:gtest' JNI_TARGET = '//lib/jni:jni' diff --git a/java/build.gradle b/java/build.gradle index c6a992d8..94851d8c 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -44,6 +44,7 @@ preBuild.dependsOn buckBuildAndCopy dependencies { compile(name: 'jsr305') compile(name: 'soloader-0.1.0', ext: 'aar') + provided(project(':yoga:proguard-annotations')) } task sourcesJar(type: Jar) { diff --git a/java/proguard-annotations/build.gradle b/java/proguard-annotations/build.gradle new file mode 100644 index 00000000..bbfeb03c --- /dev/null +++ b/java/proguard-annotations/build.gradle @@ -0,0 +1 @@ +apply plugin: 'java' diff --git a/java/com/facebook/proguard/annotations/BUCK b/java/proguard-annotations/src/main/java/com/facebook/proguard/annotations/BUCK similarity index 100% rename from java/com/facebook/proguard/annotations/BUCK rename to java/proguard-annotations/src/main/java/com/facebook/proguard/annotations/BUCK diff --git a/java/com/facebook/proguard/annotations/DoNotStrip.java b/java/proguard-annotations/src/main/java/com/facebook/proguard/annotations/DoNotStrip.java similarity index 100% rename from java/com/facebook/proguard/annotations/DoNotStrip.java rename to java/proguard-annotations/src/main/java/com/facebook/proguard/annotations/DoNotStrip.java diff --git a/settings.gradle b/settings.gradle index b0105e4f..6977bf20 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ -include ':yoga', ':yoga-layout' +include ':yoga', ':yoga-layout', ':yoga:proguard-annotations' project(':yoga').projectDir = file('java') +project(':yoga:proguard-annotations').projectDir = file('java/proguard-annotations') project(':yoga-layout').projectDir = file('android')