Przeglądaj źródła

Merge branch 'android-6.0' of https://github.com/omnirom/android into omnirom-android-6.0

Conflicts:
	default.xml
lj50036 10 lat temu
rodzic
commit
fbfc80d273
1 zmienionych plików z 1 dodań i 1 usunięć
  1. 1 1
      default.xml

+ 1 - 1
default.xml

@@ -254,7 +254,7 @@
   <!-- project path="external/tinycompress" name="android_external_tinycompress" remote="omnirom" revision="android-6.0" groups="pdk" /> -->
   <!-- project path="external/tinyxml" name="platform/external/tinyxml" groups="pdk" /> -->
   <!-- project path="external/tinyxml2" name="platform/external/tinyxml2" groups="pdk" /> -->
-  <project path="external/toybox" name="platform/external/toybox" groups="pdk" />
+  <project path="external/toybox" name="android_external_toybox" remote="omnirom" revision="android-6.0" groups="pdk" />
   <!-- project path="external/tremolo" name="platform/external/tremolo" groups="pdk" /> -->
   <!-- project path="external/v8" name="platform/external/v8" groups="pdk" /> -->
   <!-- project path="external/valgrind" name="platform/external/valgrind" groups="pdk" /> -->