diff options
| author | Xavier Ducrohet <xav@google.com> | 2015-04-22 18:03:29 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@google.com> | 2015-04-24 13:17:36 -0700 |
| commit | 83f4d2a1c955bd8f589576b9b38c420d366e0f26 (patch) | |
| tree | 655a5c794d882d7684680945b0e03b7fce31e253 /build | |
| parent | f6c11994e7251387266e6a7a42eeecbccaaa390d (diff) | |
| download | android_development-83f4d2a1c955bd8f589576b9b38c420d366e0f26.tar.gz android_development-83f4d2a1c955bd8f589576b9b38c420d366e0f26.tar.bz2 android_development-83f4d2a1c955bd8f589576b9b38c420d366e0f26.zip | |
Optional library listing file.
Also update some files for MNC.
Change-Id: I3901b07d72831cdb6557da1696ae4845e4d15be5
Diffstat (limited to 'build')
| -rw-r--r-- | build/optional.json | 8 | ||||
| -rw-r--r-- | build/sdk.atree | 15 |
2 files changed, 17 insertions, 6 deletions
diff --git a/build/optional.json b/build/optional.json new file mode 100644 index 000000000..27216d9d3 --- /dev/null +++ b/build/optional.json @@ -0,0 +1,8 @@ +[ + { + "name": "org.apache.http.legacy", + "jar": "org.apache.http.legacy.jar", + "manifest": false + } +] + diff --git a/build/sdk.atree b/build/sdk.atree index 2b5367b4c..a451b3770 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -130,18 +130,21 @@ dalvik/dx/etc/mainDexClasses.rules build-tools/${PLATFORM_NAME}/mainD ############################################################################## # version files for the SDK updater, from development.git -${HOST_OUT}/development/sdk/platform_source.properties platforms/${PLATFORM_NAME}/source.properties +${HOST_OUT}/development/sdk/platform_source.properties platforms/${PLATFORM_NAME}/source.properties # copy build prop from out/.../sdk/ -sdk/sdk-build.prop platforms/${PLATFORM_NAME}/build.prop +sdk/sdk-build.prop platforms/${PLATFORM_NAME}/build.prop -# the uper-jar file that apps link against. This is the public API -${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/${PLATFORM_NAME}/android.jar -${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar platforms/${PLATFORM_NAME}/uiautomator.jar +# Main Public API jar +${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/${PLATFORM_NAME}/android.jar +# optional API files. +development/build/optional.json platforms/${PLATFORM_NAME}/optional/optional.json ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/org.apache.http.legacy_intermediates/javalib.jar platforms/${PLATFORM_NAME}/optional/org.apache.http.legacy.jar +# deprecated APIs +${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar platforms/${PLATFORM_NAME}/uiautomator.jar # the aidl precompiled include -obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl +obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl # emulator skins from sdk.git development/tools/emulator/skins/QVGA platforms/${PLATFORM_NAME}/skins/QVGA |