diff options
| author | Narayan Kamath <narayan@google.com> | 2014-08-05 15:42:34 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-08-07 15:32:07 +0100 |
| commit | 1fabc35cb51e6f019141c25430e4e285741625fd (patch) | |
| tree | 45e9871729977aad395dc06744dd0cd4c1be75c3 | |
| parent | 46a8ffe87f3cba070fb18a90e3c5c1f73468f99c (diff) | |
| download | system_core-1fabc35cb51e6f019141c25430e4e285741625fd.zip system_core-1fabc35cb51e6f019141c25430e4e285741625fd.tar.gz system_core-1fabc35cb51e6f019141c25430e4e285741625fd.tar.bz2 | |
Export the new system_server classpath.
bug: 16555230
Change-Id: I99d2d219b5bd6dc4807cb53e44dc5715cc0815b3
| -rw-r--r-- | rootdir/Android.mk | 3 | ||||
| -rw-r--r-- | rootdir/init.environ.rc.in | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index aca08bf..3ecb1db 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -31,7 +31,7 @@ LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \ include $(BUILD_SYSTEM)/base_rules.mk # Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH has changed. -bcp_md5 := $(word 1, $(shell echo $(PRODUCT_BOOTCLASSPATH) | $(MD5SUM))) +bcp_md5 := $(word 1, $(shell echo $(PRODUCT_BOOTCLASSPATH) $(PRODUCT_SYSTEM_SERVER_CLASSPATH) | $(MD5SUM))) bcp_dep := $(intermediates)/$(bcp_md5).bcp.dep $(bcp_dep) : $(hide) mkdir -p $(dir $@) && rm -rf $(dir $@)*.bcp.dep && touch $@ @@ -40,6 +40,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in $(bcp_dep) @echo "Generate: $< -> $@" @mkdir -p $(dir $@) $(hide) sed -e 's?%BOOTCLASSPATH%?$(PRODUCT_BOOTCLASSPATH)?g' $< >$@ + $(hide) sed -i -e 's?%SYSTEMSERVERCLASSPATH%?$(PRODUCT_SYSTEM_SERVER_CLASSPATH)?g' $@ bcp_md5 := bcp_dep := diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in index 1f964e3..67222d7 100644 --- a/rootdir/init.environ.rc.in +++ b/rootdir/init.environ.rc.in @@ -9,4 +9,5 @@ on init export ASEC_MOUNTPOINT /mnt/asec export LOOP_MOUNTPOINT /mnt/obb export BOOTCLASSPATH %BOOTCLASSPATH% + export SYSTEMSERVERCLASSPATH %SYSTEMSERVERCLASSPATH% export LD_PRELOAD libsigchain.so |