From 6dcb3d4ef46312729bb6f16c473b433474863f68 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 10 Aug 2012 15:52:22 +0200 Subject: Related fdo#51252: No more prereg, no more unopkg sync Now that 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying share/prereg/bundled to avoid startup crashes" removed the use of share/prereg, there is no longer need to generate it in the first place (by calling "unopkg sync" at build or installation time), and so no need for the "unopkg sync" sub- command, either. This also allows to simplify some of the jvmfwk code that was only there so that "unopkg sync" (which can require a JVM) can work in "hostile" environments (during build and installation). Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f --- android/qa/desktop/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'android/qa') diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 84d8f81e585c..799edc235354 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -37,7 +37,6 @@ buildrcs: echo 'URE_MORE_TYPES=file:///assets/ure/share/misc/types.rdb file:///assets/program/types/types.rdb' >> assets/program/fundamentalrc echo 'URE_MORE_SERVICES= <$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc echo 'BUNDLED_EXTENSIONS=$$BRAND_BASE_DIR/share/extensions' >> assets/program/fundamentalrc - echo 'BUNDLED_EXTENSIONS_PREREG=$$BRAND_BASE_DIR/share/prereg/bundled' >> assets/program/fundamentalrc echo 'BUNDLED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bundled' >> assets/program/fundamentalrc echo 'TMP_EXTENSIONS=$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/tmp' >> assets/program/fundamentalrc echo 'SHARED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/shared' >> assets/program/fundamentalrc -- cgit v1.2.3