Uploaded image for project: 'JDK'
  1. JDK
  2. JDK-8098304

[Android] align sdk directory structure dalvik with other platforms

    XMLWordPrintable

    Details

      Description

      The following patch aligns the structure of the dalvik SDK directory with the other platforms (e.g. rt/lib/ext/jfxrt.jar)
      Also, we explicitly don't compile JFR

      diff -r 9f5303fb78fb buildSrc/dalvik.gradle
      --- a/buildSrc/dalvik.gradle Fri Jun 13 12:36:57 2014 +1200
      +++ b/buildSrc/dalvik.gradle Fri Jun 13 11:05:29 2014 +0200
      @@ -318,11 +318,11 @@
                           from(
                                "modules/graphics/build/libs/activity/dalvik/${props.library(props.activity.lib)}"
                           )
      - into ("build/dalvik-sdk/dalvik/${props.libDest}")
      + into ("build/dalvik-sdk/rt/${props.libDest}")
                       }
                       copy {
                           from ("modules/graphics/build/libs/${props.jfxdvklib}")
      - into ("build/dalvik-sdk/dalvik/lib")
      + into ("build/dalvik-sdk/rt/lib/ext")
                       }
       /*
                       copy {
      @@ -333,7 +333,7 @@
                       if (compileNativeText) {
                           copy {
                               from ("modules/graphics/build/libs/fontNativeFreetype/dalvik")
      - into ("build/dalvik-sdk/rt/$DALVIK.libDest")
      + into ("build/dalvik-sdk/rt/${props.libDest}")
                           }
                       }
                   }
      @@ -656,3 +656,4 @@
       DALVIK.includeGTK = true
       DALVIK.includeLens = true
       ext.IS_COMPILE_PANGO = false
      +ext.IS_COMPILE_JFR = false

        Attachments

          Activity

            People

            Assignee:
            ddhill David Hill (Inactive)
            Reporter:
            jvos Johan Vos
            Votes:
            0 Vote for this issue
            Watchers:
            4 Start watching this issue

              Dates

              Created:
              Updated:
              Resolved:
              Imported: